Changeset 34836

Timestamp:

08/11/09 04:45:10 (4 years ago)

Author:

saturday06

Message:

asdf

Location:

lang/objective-cplusplus/i3/trunk/src/mil/include/mil

Files:

• ModuleCommon.h (modified) (2 diffs)
• StaticData.cpp (modified) (2 diffs)

lang/objective-cplusplus/i3/trunk/src/mil/include/mil/ModuleCommon.h

@@ -82 +82 @@
 };
 
-struct AutoJoiner {
-    void* obj;
-    void (*post_exit)(void*, void*);
-    void (*join)(void*);
-    char event_memory[sizeof(void*) * 10];
-};
-
-extern int auto_joiner_index;
-extern AutoJoiner auto_joiners[MIL_MAX_THREADS];
-
 template <class T>
 void post_exit_template(void* obj, void* event_memory) {
@@ -108 +98 @@
 }
 
+struct AutoJoiner {
+    void* obj;
+    void (*post_exit)(void*, void*);
+    void (*join)(void*);
+    char event_memory[sizeof(void*) * 10];
+};
+
+void set_auto_join_body(AutoJoiner&);
+void do_auto_join();
+
 template <class T>
 void set_auto_join(T* t) {
-    auto_joiners[auto_joiner_index].obj = reinterpret_cast<void*>(t);
-    auto_joiners[auto_joiner_index].post_exit = post_exit_template<T>;
-    auto_joiners[auto_joiner_index].join = join_template<T>;
-    auto_joiner_index++;
-}
-
-static inline void do_auto_join() {
-    for (int i = 0; i < auto_joiner_index; i++) {
-        auto_joiners[i].post_exit(auto_joiners[i].obj, auto_joiners[i].event_memory);
-    }
-    for (int i = 0; i < auto_joiner_index; i++) {
-        auto_joiners[i].join(auto_joiners[i].obj);
-    }
-    auto_joiner_index = 0;
+    AutoJoiner a = {};
+    a.obj = reinterpret_cast<void*>(t);
+    a.post_exit = post_exit_template<T>;
+    a.join = join_template<T>;
+    set_auto_join_body(a);
 }
 

lang/objective-cplusplus/i3/trunk/src/mil/include/mil/StaticData.cpp

@@ -17 +17 @@
 
 namespace mil {
+
 namespace thread {
 Serial id_serial(MIL_MAX_THREADS);
@@ -48 +49 @@
 int auto_joiner_index = 0;
 AutoJoiner auto_joiners[MIL_MAX_THREADS];
+
+void set_auto_join_body(AutoJoiner& a) {
+    auto_joiners[auto_joiner_index] = a;
+    auto_joiner_index++;
+    if (auto_joiner_index >= MIL_MAX_THREADS) {
+        halt << "auto_joiner_index is too big [" << auto_joiner_index << "]";
+        return;
+    }
+}
+
+void do_auto_join() {
+    for (int i = 0; i < auto_joiner_index; i++) {
+        auto_joiners[i].post_exit(auto_joiners[i].obj, auto_joiners[i].event_memory);
+    }
+    for (int i = 0; i < auto_joiner_index; i++) {
+        auto_joiners[i].join(auto_joiners[i].obj);
+    }
+    auto_joiner_index = 0;
+}
+
+
 }