From: mquinson Date: Tue, 22 Jan 2008 16:39:40 +0000 (+0000) Subject: try to kill the singleton design pattern X-Git-Tag: v3.3~650 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/5b0f10320bc41d518a6a15e71182f2a14bbf03ad?ds=sidebyside try to kill the singleton design pattern git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5215 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/src/xbt/backtrace_windows.c b/src/xbt/backtrace_windows.c index 154c31232b..4b536e8f86 100644 --- a/src/xbt/backtrace_windows.c +++ b/src/xbt/backtrace_windows.c @@ -18,146 +18,102 @@ /* Pointer function to SymInitialize() */ -typedef BOOL(WINAPI * xbt_pfn_sym_initialize_t) (HANDLE, PSTR, BOOL); +BOOL(WINAPI * fun_initialize) (HANDLE, PSTR, BOOL); /* Pointer function to SymCleanup() */ -typedef BOOL(WINAPI * xbt_pfn_sym_cleanup_t) (HANDLE hProcess); +static BOOL(WINAPI * fun_cleanup) (HANDLE hProcess); /* Pointer function to SymFunctionTableAccess() */ -typedef PVOID(WINAPI * xbt_pfn_sym_function_table_access_t) (HANDLE, DWORD); +static PVOID(WINAPI * fun_function_table_access) (HANDLE, DWORD); /* Pointer function to SymGetLineFromAddr() */ -typedef BOOL(WINAPI * xbt_pfn_sym_get_line_from_addr_t) (HANDLE, DWORD, - PDWORD, - PIMAGEHLP_LINE); +static BOOL(WINAPI * fun_get_line_from_addr) (HANDLE, DWORD, + PDWORD, + PIMAGEHLP_LINE); /* Pointer function to SymGetModuleBase() */ -typedef DWORD(WINAPI * xbt_pfn_sym_get_module_base_t) (HANDLE, DWORD); +static DWORD(WINAPI * fun_get_module_base) (HANDLE, DWORD); /* Pointer function to SymGetOptions() */ -typedef DWORD(WINAPI * xbt_pfn_sym_get_options_t) (VOID); +static DWORD(WINAPI * fun_get_options) (VOID); /* Pointer function to SymGetSymFromAddr() */ -typedef BOOL(WINAPI * xbt_pfn_sym_get_sym_from_addr_t) (HANDLE, DWORD, PDWORD, - OUT PIMAGEHLP_SYMBOL); +static BOOL(WINAPI * fun_get_sym_from_addr) (HANDLE, DWORD, PDWORD, + OUT PIMAGEHLP_SYMBOL); /* Pointer function to SymSetOptions() */ -typedef DWORD(WINAPI * xbt_pfn_sym_set_options_t) (DWORD); +static DWORD(WINAPI * fun_set_options) (DWORD); /* Pointer function to StackWalk() */ -typedef BOOL(WINAPI * xbt_pfn_stack_walk_t) (DWORD, HANDLE, HANDLE, - LPSTACKFRAME, PVOID, - PREAD_PROCESS_MEMORY_ROUTINE, - PFUNCTION_TABLE_ACCESS_ROUTINE, - PGET_MODULE_BASE_ROUTINE, - PTRANSLATE_ADDRESS_ROUTINE); - -/* This structure represents the debug_help library used interface */ -typedef struct s_xbt_debug_help { - HINSTANCE instance; - HANDLE process_handle; - xbt_pfn_sym_initialize_t sym_initialize; - xbt_pfn_sym_cleanup_t sym_cleanup; - xbt_pfn_sym_function_table_access_t sym_function_table_access; - xbt_pfn_sym_get_line_from_addr_t sym_get_line_from_addr; - xbt_pfn_sym_get_module_base_t sym_get_module_base; - xbt_pfn_sym_get_options_t sym_get_options; - xbt_pfn_sym_get_sym_from_addr_t sym_get_sym_from_addr; - xbt_pfn_sym_set_options_t sym_set_options; - xbt_pfn_stack_walk_t stack_walk; -} s_xbt_debug_hlp_t, *xbt_debug_hlp_t; - - -/* the address to the unique reference to the debug help library interface */ -static xbt_debug_hlp_t dbg_hlp = NULL; +static BOOL(WINAPI * xbt_pfn_stack_walk) (DWORD, HANDLE, HANDLE, + LPSTACKFRAME, PVOID, + PREAD_PROCESS_MEMORY_ROUTINE, + PFUNCTION_TABLE_ACCESS_ROUTINE, + PGET_MODULE_BASE_ROUTINE, + PTRANSLATE_ADDRESS_ROUTINE); + +static HINSTANCE instance = NULL; +static HANDLE process_handle = NULL; + /* Module creation/destruction: nothing to do on linux */ void xbt_backtrace_init(void) { - HANDLE process_handle = GetCurrentProcess(); + process_handle = GetCurrentProcess(); - if (dbg_hlp) { + if (instance) { /* debug help is already loaded */ return; } - /* allocation */ - dbg_hlp = xbt_new0(s_xbt_debug_hlp_t, 1); - /* load the library */ - dbg_hlp->instance = LoadLibraryA("Dbghelp.dll"); + instance = LoadLibraryA("Dbghelp.dll"); - if (!dbg_hlp->instance) { - free(dbg_hlp); - dbg_hlp = NULL; + if (!instance) return; - } /* get the pointers to debug help library exported functions */ - dbg_hlp->sym_initialize = - (xbt_pfn_sym_initialize_t) GetProcAddress(dbg_hlp->instance, "SymInitialize"); - - dbg_hlp->sym_cleanup = - (xbt_pfn_sym_cleanup_t) GetProcAddress(dbg_hlp->instance, "SymCleanup"); - - dbg_hlp->sym_function_table_access = - (xbt_pfn_sym_function_table_access_t) GetProcAddress(dbg_hlp->instance, "SymFunctionTableAccess"); - - dbg_hlp->sym_get_line_from_addr = - (xbt_pfn_sym_get_line_from_addr_t) GetProcAddress(dbg_hlp->instance, "SymGetLineFromAddr"); - - dbg_hlp->sym_get_module_base = - (xbt_pfn_sym_get_module_base_t) GetProcAddress(dbg_hlp->instance, "SymGetModuleBase"); - - dbg_hlp->sym_get_options = - (xbt_pfn_sym_get_options_t) GetProcAddress(dbg_hlp->instance, "SymGetOptions"); - - dbg_hlp->sym_get_sym_from_addr = - (xbt_pfn_sym_get_sym_from_addr_t) GetProcAddress(dbg_hlp->instance, "SymGetSymFromAddr"); - - dbg_hlp->sym_set_options = - (xbt_pfn_sym_set_options_t) GetProcAddress(dbg_hlp->instance, "SymSetOptions"); - - dbg_hlp->stack_walk = - (xbt_pfn_stack_walk_t) GetProcAddress(dbg_hlp->instance, "StackWalk"); + fun_initialize = GetProcAddress(instance, "SymInitialize"); + fun_cleanup = GetProcAddress(instance, "SymCleanup"); + fun_function_table_access = GetProcAddress(instance, "SymFunctionTableAccess"); + fun_get_line_from_addr = GetProcAddress(instance, "SymGetLineFromAddr"); + fun_get_module_base = GetProcAddress(instance, "SymGetModuleBase"); + fun_get_options = GetProcAddress(instance, "SymGetOptions"); + fun_get_sym_from_addr = GetProcAddress(instance, "SymGetSymFromAddr"); + fun_set_options = GetProcAddress(instance, "SymSetOptions"); + fun_stack_walk = GetProcAddress(instance, "StackWalk"); /* Check that everything worked well */ - if (!dbg_hlp->sym_initialize || - !dbg_hlp->sym_cleanup || - !dbg_hlp->sym_function_table_access || - !dbg_hlp->sym_get_line_from_addr || - !dbg_hlp->sym_get_module_base || - !dbg_hlp->sym_get_options || - !dbg_hlp->sym_get_sym_from_addr || - !dbg_hlp->sym_set_options || - !dbg_hlp->stack_walk + if (!fun_initialize || + !fun_cleanup || + !fun_function_table_access || + !fun_get_line_from_addr || + !fun_get_module_base || + !fun_get_options || + !fun_get_sym_from_addr || + !fun_set_options || + !fun_stack_walk ) { - FreeLibrary(dbg_hlp->instance); - free(dbg_hlp); - dbg_hlp = NULL; + FreeLibrary(instance); + instance = NULL; return; } - dbg_hlp->process_handle = process_handle; + (*fun_set_options) ((*fun_get_options) () | + SYMOPT_LOAD_LINES | SYMOPT_DEFERRED_LOADS); - (*(dbg_hlp->sym_set_options)) ((*(dbg_hlp->sym_get_options)) () | - SYMOPT_LOAD_LINES | SYMOPT_DEFERRED_LOADS); - - if (!(*(dbg_hlp->sym_initialize)) (dbg_hlp->process_handle, 0, 1)) { - FreeLibrary(dbg_hlp->instance); - free(dbg_hlp); - dbg_hlp = NULL; + if (!(*fun_initialize) (process_handle, 0, 1)) { + FreeLibrary(instance); + instance = NULL; } } void xbt_backtrace_exit(void) { - if (!dbg_hlp) + if (!instance) return; - if ((dbg_hlp->sym_cleanup) (dbg_hlp->process_handle)) - FreeLibrary(dbg_hlp->instance); - + if ((*fun_cleanup) (process_handle)) + FreeLibrary(instance); - free(dbg_hlp); - dbg_hlp = NULL; + instance = NULL; } /* @@ -196,10 +152,8 @@ void xbt_ex_setup_backtrace(xbt_ex_t * e) e->bt_strings = xbt_new(char *, e->used); - for (i = 0; i < e->used; i++) { - e->bt_strings[i] = xbt_strdup(backtrace_syms[i]); - free(backtrace_syms[i]); - } + for (i = 0; i < e->used; i++) + e->bt_strings[i] = backtrace_syms[i]; free(backtrace_syms); } @@ -260,23 +214,19 @@ int backtrace(void **buffer, int size) stack_frame->AddrStack.Offset = context.Esp; stack_frame->AddrStack.Mode = AddrModeFlat; - if ((*(dbg_hlp->stack_walk)) (IMAGE_FILE_MACHINE_I386, - dbg_hlp->process_handle, - GetCurrentThread(), - stack_frame, - &context, - NULL, - dbg_hlp->sym_function_table_access, - dbg_hlp->sym_get_module_base, NULL) + if ((*fun_stack_walk) (IMAGE_FILE_MACHINE_I386, + process_handle, + GetCurrentThread(), + stack_frame, + &context, + NULL, + fun_function_table_access, + fun_get_module_base, NULL) && !first) { if (stack_frame->AddrReturn.Offset) { - if ((*(dbg_hlp->sym_get_sym_from_addr)) - (dbg_hlp->process_handle, stack_frame->AddrPC.Offset, &offset, - pSym)) { - if ((*(dbg_hlp->sym_get_line_from_addr)) - (dbg_hlp->process_handle, stack_frame->AddrPC.Offset, &offset, - &line_info)) + if ((*fun_get_sym_from_addr) (process_handle, stack_frame->AddrPC.Offset, &offset, pSym)) { + if ((*fun_get_line_from_addr) (process_handle, stack_frame->AddrPC.Offset, &offset, &line_info)) buffer[pos++] = (void *) stack_frame; } } else { @@ -331,12 +281,8 @@ char **backtrace_symbols(void *const *buffer, int size) if (NULL != stack_frame) { - if ((*(dbg_hlp->sym_get_sym_from_addr)) - (dbg_hlp->process_handle, stack_frame->AddrPC.Offset, &offset, - pSym)) { - if ((*(dbg_hlp->sym_get_line_from_addr)) - (dbg_hlp->process_handle, stack_frame->AddrPC.Offset, &offset, - &line_info)) { + if ((*fun_get_sym_from_addr) (process_handle, stack_frame->AddrPC.Offset, &offset, pSym)) { + if ((*fun_get_line_from_addr) (process_handle, stack_frame->AddrPC.Offset, &offset, &line_info)) { strings[pos] = bprintf("** In %s() at %s:%d", pSym->Name, line_info.FileName, line_info.LineNumber);