gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

exchange the dcfa stuff init/exit order in mcexec

Browse Source
This commit is contained in:
simin
2013-05-20 13:52:17 -05:00
parent e09160cce7
commit 0bdc047515
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
executer/user/mcexec.c
View File

@@ -441,6 +441,11 @@ int main(int argc, char **argv)
/** /**
* TODO: need mutex for static structures * TODO: need mutex for static structures
*/ */
if(mc_cmd_server_init()){
fprintf(stderr, "Error: cmd server init failed\n");
return 1;
}
#ifdef CMD_DCFA #ifdef CMD_DCFA
if(ibmic_cmd_server_init()){ if(ibmic_cmd_server_init()){
fprintf(stderr, "Error: Failed to initialize ibmic_cmd_server.\n"); fprintf(stderr, "Error: Failed to initialize ibmic_cmd_server.\n");
@@ -454,11 +459,6 @@ int main(int argc, char **argv)
return -1; return -1;
} }
#endif #endif
if(mc_cmd_server_init()){
fprintf(stderr, "Error: cmd server init failed\n");
return 1;
}
__dprint("mccmd server initialized\n"); __dprint("mccmd server initialized\n");
#endif #endif
@@ -737,7 +737,6 @@ int main_loop(int fd, int cpu, pthread_mutex_t *lock)
w.sr.args[0], cpu); w.sr.args[0], cpu);
#ifdef USE_SYSCALL_MOD_CALL #ifdef USE_SYSCALL_MOD_CALL
mc_cmd_server_exit();
#ifdef CMD_DCFA #ifdef CMD_DCFA
ibmic_cmd_server_exit(); ibmic_cmd_server_exit();
#endif #endif
@@ -745,7 +744,7 @@ int main_loop(int fd, int cpu, pthread_mutex_t *lock)
#ifdef CMD_DCFAMPI #ifdef CMD_DCFAMPI
dcfampi_cmd_server_exit(); dcfampi_cmd_server_exit();
#endif #endif
mc_cmd_server_exit();
__dprint("mccmd server exited\n"); __dprint("mccmd server exited\n");
#endif #endif
exit(0); exit(0);

2
kernel/init.c
View File

@@ -220,8 +220,10 @@ int main(void)
#ifdef DCFA_KMOD #ifdef DCFA_KMOD
mc_cmd_client_init(); mc_cmd_client_init();
#ifdef CMD_DCFA
ibmic_cmd_init(); ibmic_cmd_init();
#endif #endif
#endif
#ifdef DCFA_RUN #ifdef DCFA_RUN
kputs("DCFA begin\n"); kputs("DCFA begin\n");