comparison TaskManager/kernel/main.cc @ 397:a4f690f44842

delete manager (in kernel/ppe/TaskManager.h) don't move.
author game@henri.cr.ie.u-ryukyu.ac.jp
date Sun, 20 Sep 2009 18:55:26 +0900
parents f64d75473f95
children d9111086b2c4
comparison
equal deleted inserted replaced
396:d1f1e27d0a12 397:a4f690f44842
6 /*! 6 /*!
7 User が書いた TMmain() (*名前は固定) を実行する 7 User が書いた TMmain() (*名前は固定) を実行する
8 */ 8 */
9 9
10 /* User main function */ 10 /* User main function */
11 extern int TMmain(int argc, char *argv[]); 11 extern int TMmain(TaskManager* manager, int argc, char *argv[]);
12 12
13 /* Default TMend function */ 13 /* Default TMend function */
14 static void 14 static void
15 defaultTMend(void) {} 15 defaultTMend(TaskManager *manager) {}
16 16
17 TaskManager *manager; 17 //TaskManager *manager;
18 18
19 /*! 19 /*!
20 const char *usr_help_str を User 側で指定する必要がある 20 const char *usr_help_str を User 側で指定する必要がある
21 -help で出力される文字列 21 -help で出力される文字列
22 */ 22 */
43 printf("%s", help_str); 43 printf("%s", help_str);
44 return EXIT_SUCCESS; 44 return EXIT_SUCCESS;
45 } 45 }
46 } 46 }
47 47
48 manager = new TaskManager(machineNum); 48 TaskManager *manager = new TaskManager(machineNum);
49 manager->init(); 49 manager->init();
50 50
51 manager->set_TMend(defaultTMend); 51 manager->set_TMend(defaultTMend);
52 52
53 if (TMmain(argc, argv) < 0) { 53 if (TMmain(manager, argc, argv) < 0) {
54 goto FINISH; 54 goto FINISH;
55 } 55 }
56 56
57 manager->run(); 57 manager->run();
58 58
59 (manager->tm_end)(); 59 (manager->tm_end)(manager);
60 60
61 FINISH: 61 FINISH:
62 delete manager; 62 delete manager;
63 63
64 return EXIT_SUCCESS; 64 return EXIT_SUCCESS;