Update the struct ProfileData

Author: adonis0147

BehaviorTree/include/behavior_tree.h

@@ -1,9 +1,9 @@
-#pragma once
-#ifndef BEHAVIOR_TREE_H
-#define BEHAVIOR_TREE_H
-
-#include "global.h"
-
-void InitModule(const char *module_name);
-
-#endif // !BEHAVIOR_TREE_H
+#pragma once
+#ifndef BEHAVIOR_TREE_H
+#define BEHAVIOR_TREE_H
+
+#include "global.h"
+
+void InitModule(const char *module_name);
+
+#endif // !BEHAVIOR_TREE_H

BehaviorTree/include/node_data.h

@@ -1,11 +1,11 @@
-#pragma once
-#ifndef NODE_DATA_H
-#define NODE_DATA_H
-
-struct NodeData {
-	NodeData() : child_index(0) {}
-
-	size_t child_index;
-};
-
-#endif // !NODE_DATA_H
+#pragma once
+#ifndef NODE_DATA_H
+#define NODE_DATA_H
+
+struct NodeData {
+	NodeData() : child_index(0) {}
+
+	size_t child_index;
+};
+
+#endif // !NODE_DATA_H

BehaviorTree/include/profile/profile_data.h

@@ -5,7 +5,7 @@
 #include <ctime>
 
 struct ProfileData {
-	unsigned int times;
+	unsigned int calls;
 	unsigned long clocks;
 };
 

BehaviorTree/include/profile/profiler.h

@@ -26,7 +26,7 @@ class Profiler {
 	void AddProfileData(NodeId node_id, clock_t consumed_clocks) {
 		if (!current_collection_) return;
 		ProfileData &data = (*current_collection_)[node_id];
-		++data.times;
+		++data.calls;
 		data.clocks += consumed_clocks;
 	}
 

BehaviorTree/src/behavior_tree.cc

@@ -102,9 +102,9 @@ static PyObject *DumpProfileInPyDictObject() {
 			PyObject *py_node_id = Py_BuildValue("i", inner_pair.first);
 			PyObject *py_data = PyDict_New();
 
-			PyObject *py_times = Py_BuildValue("I", inner_pair.second.times);
-			PyDict_SetItemString(py_data, "times", py_times);
-			Py_DECREF(py_times);
+			PyObject *py_calls = Py_BuildValue("I", inner_pair.second.calls);
+			PyDict_SetItemString(py_data, "calls", py_calls);
+			Py_DECREF(py_calls);
 
 			PyObject *py_clocks = Py_BuildValue("k", inner_pair.second.clocks);
 			PyDict_SetItemString(py_data, "clocks", py_clocks);

BehaviorTree/src/global.cc

@@ -1,8 +1,8 @@
-#include "global.h"
-#include <ctime>
-
-void get_timestamp(char *buffer, size_t size) {
-	time_t timestamp = time(NULL);
-	struct tm *time_info = localtime(&timestamp);
-	strftime(buffer, sizeof(char *) * size, "%Y-%m-%d %H:%M:%S", time_info);
-}
+#include "global.h"
+#include <ctime>
+
+void get_timestamp(char *buffer, size_t size) {
+	time_t timestamp = time(NULL);
+	struct tm *time_info = localtime(&timestamp);
+	strftime(buffer, sizeof(char *) * size, "%Y-%m-%d %H:%M:%S", time_info);
+}

BehaviorTree/src/main.cc

@@ -1,19 +1,19 @@
-#include "global.h"
-#include "behavior_tree.h"
-
-#if defined(_DEBUG) | defined(TRACE_TICK)
-#define MODULE_NAME "behavior_tree_d"
-#else
-#define MODULE_NAME "behavior_tree"
-#endif
-
-PyMODINIT_FUNC
-#if defined(_DEBUG) | defined(TRACE_TICK)
-initbehavior_tree_d() {
-	PyErr_Warn(PyExc_RuntimeWarning, "This is the debug build of behavior_tree module!");
-#else
-initbehavior_tree() {
-#endif
-
-	InitModule(MODULE_NAME);
-}
+#include "global.h"
+#include "behavior_tree.h"
+
+#if defined(_DEBUG) | defined(TRACE_TICK)
+#define MODULE_NAME "behavior_tree_d"
+#else
+#define MODULE_NAME "behavior_tree"
+#endif
+
+PyMODINIT_FUNC
+#if defined(_DEBUG) | defined(TRACE_TICK)
+initbehavior_tree_d() {
+	PyErr_Warn(PyExc_RuntimeWarning, "This is the debug build of behavior_tree module!");
+#else
+initbehavior_tree() {
+#endif
+
+	InitModule(MODULE_NAME);
+}

CMakeLists.txt

@@ -21,12 +21,8 @@ include_directories(
 
 add_library(${PROJECT_NAME} SHARED ${HEADER_FILES} ${SOURCE_FILES})
 
-if(MSVC)
-	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /D TRACE_TICK /D PROFILE_TICK")
-else(MSVC)
-	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
-	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DTRACE_TICK -DPROFILE_TICK")
-endif(MSVC)
+set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
+set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DTRACE_TICK -DPROFILE_TICK")
 
 set_target_properties(${PROJECT_NAME} PROPERTIES DEBUG_POSTFIX "_d")
 set_target_properties(${PROJECT_NAME} PROPERTIES RELWITHDEBINFO_POSTFIX "_d")