--- a/TaskManager/kernel/main.cc	Fri Sep 18 18:28:56 2009 +0900
+++ b/TaskManager/kernel/main.cc	Sun Sep 20 18:55:26 2009 +0900
@@ -8,13 +8,13 @@
  */
 
 /* User main function */
-extern int TMmain(int argc, char *argv[]);
+extern int TMmain(TaskManager* manager, int argc, char *argv[]);
 
 /* Default TMend function */
 static void
-defaultTMend(void) {}
+defaultTMend(TaskManager *manager) {}
 
-TaskManager *manager;
+//TaskManager *manager;
 
 /*!
   const char *usr_help_str を User 側で指定する必要がある
@@ -45,18 +45,18 @@
         }
     }
 
-    manager = new TaskManager(machineNum);
+    TaskManager *manager = new TaskManager(machineNum);
     manager->init();
 
     manager->set_TMend(defaultTMend);
 
-    if (TMmain(argc, argv) < 0) {
+    if (TMmain(manager, argc, argv) < 0) {
 	goto FINISH;
     }
 
     manager->run();
 
-    (manager->tm_end)();
+    (manager->tm_end)(manager);
 
 FINISH:
     delete manager;