From f30175cd3c41f95317c796dc4275ae3ba65b6a94 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Fri, 30 Mar 2012 10:41:44 +0200 Subject: [PATCH] Remove unused 2nd parameter for XBT_LOG_CONNECT. --- include/xbt/log.h | 6 +- src/smpi/smpi_global.c | 18 +-- src/xbt/log.c | 230 ++++++++++++++++++------------------ tools/gras/stub_generator.c | 2 +- 4 files changed, 128 insertions(+), 128 deletions(-) diff --git a/include/xbt/log.h b/include/xbt/log.h index 64323f7f20..56e915942f 100644 --- a/include/xbt/log.h +++ b/include/xbt/log.h @@ -125,10 +125,10 @@ typedef enum { ((void)0) #endif -#define XBT_LOG_CONNECT(child, parent_cat) \ +#define XBT_LOG_CONNECT(cat) \ if (1) { \ - extern void _XBT_LOGV_CTOR(child)(void); \ - _XBT_LOGV_CTOR(child)(); \ + extern void _XBT_LOGV_CTOR(cat)(void); \ + _XBT_LOGV_CTOR(cat)(); \ } else ((void)0) /* XBT_LOG_NEW_SUBCATEGORY_helper: diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c index ba6abe3b1f..b155eb684c 100644 --- a/src/smpi/smpi_global.c +++ b/src/smpi/smpi_global.c @@ -252,15 +252,15 @@ int MAIN__(void) } /* Connect log categories. See xbt/log.c */ - XBT_LOG_CONNECT(smpi_base, smpi); - XBT_LOG_CONNECT(smpi_bench, smpi); - XBT_LOG_CONNECT(smpi_coll, smpi); - XBT_LOG_CONNECT(smpi_comm, smpi); - XBT_LOG_CONNECT(smpi_group, smpi); - XBT_LOG_CONNECT(smpi_kernel, smpi); - XBT_LOG_CONNECT(smpi_mpi, smpi); - XBT_LOG_CONNECT(smpi_mpi_dt, smpi); - XBT_LOG_CONNECT(smpi_pmpi, smpi); + XBT_LOG_CONNECT(smpi_base); + XBT_LOG_CONNECT(smpi_bench); + XBT_LOG_CONNECT(smpi_coll); + XBT_LOG_CONNECT(smpi_comm); + XBT_LOG_CONNECT(smpi_group); + XBT_LOG_CONNECT(smpi_kernel); + XBT_LOG_CONNECT(smpi_mpi); + XBT_LOG_CONNECT(smpi_mpi_dt); + XBT_LOG_CONNECT(smpi_pmpi); #ifdef HAVE_TRACING TRACE_global_init(&xargc, xargv); diff --git a/src/xbt/log.c b/src/xbt/log.c index eb1f4f7fe6..6d60a29705 100644 --- a/src/xbt/log.c +++ b/src/xbt/log.c @@ -541,165 +541,165 @@ static void xbt_log_connect_categories(void) /* Also permit that they are correctly listed by xbt_log_help_categories() */ /* amok */ - XBT_LOG_CONNECT(amok_bw, amok); - XBT_LOG_CONNECT(amok_bw_sat, amok_bw); - XBT_LOG_CONNECT(amok_pm, amok); + XBT_LOG_CONNECT(amok_bw); + XBT_LOG_CONNECT(amok_bw_sat); + XBT_LOG_CONNECT(amok_pm); /* gras */ - XBT_LOG_CONNECT(gras_modules, gras); - XBT_LOG_CONNECT(gras_msg, gras); - XBT_LOG_CONNECT(gras_msg_read, gras_msg); - XBT_LOG_CONNECT(gras_msg_rpc, gras_msg); - XBT_LOG_CONNECT(gras_timer, gras); - XBT_LOG_CONNECT(gras_trp, gras); - XBT_LOG_CONNECT(gras_trp_file, gras_trp); - XBT_LOG_CONNECT(gras_virtu, gras); - XBT_LOG_CONNECT(gras_virtu_emul, gras_virtu); - XBT_LOG_CONNECT(gras_virtu_process, gras_virtu); + XBT_LOG_CONNECT(gras_modules); + XBT_LOG_CONNECT(gras_msg); + XBT_LOG_CONNECT(gras_msg_read); + XBT_LOG_CONNECT(gras_msg_rpc); + XBT_LOG_CONNECT(gras_timer); + XBT_LOG_CONNECT(gras_trp); + XBT_LOG_CONNECT(gras_trp_file); + XBT_LOG_CONNECT(gras_virtu); + XBT_LOG_CONNECT(gras_virtu_emul); + XBT_LOG_CONNECT(gras_virtu_process); /* xbt */ - XBT_LOG_CONNECT(graphxml_parse, xbt); - XBT_LOG_CONNECT(log, xbt); - XBT_LOG_CONNECT(mm_diff, xbt); - XBT_LOG_CONNECT(module, xbt); - XBT_LOG_CONNECT(peer, xbt); - XBT_LOG_CONNECT(replay, xbt); - XBT_LOG_CONNECT(strbuff, xbt); - XBT_LOG_CONNECT(xbt_cfg, xbt); - XBT_LOG_CONNECT(xbt_dict, xbt); - XBT_LOG_CONNECT(xbt_dict_cursor, xbt_dict); - XBT_LOG_CONNECT(xbt_dict_elm, xbt_dict); + XBT_LOG_CONNECT(graphxml_parse); + XBT_LOG_CONNECT(log); + XBT_LOG_CONNECT(mm_diff); + XBT_LOG_CONNECT(module); + XBT_LOG_CONNECT(peer); + XBT_LOG_CONNECT(replay); + XBT_LOG_CONNECT(strbuff); + XBT_LOG_CONNECT(xbt_cfg); + XBT_LOG_CONNECT(xbt_dict); + XBT_LOG_CONNECT(xbt_dict_cursor); + XBT_LOG_CONNECT(xbt_dict_elm); #ifdef XBT_USE_DEPRECATED - XBT_LOG_CONNECT(xbt_dict_multi, xbt_dict); + XBT_LOG_CONNECT(xbt_dict_multi); #endif - XBT_LOG_CONNECT(xbt_ddt, xbt); - XBT_LOG_CONNECT(xbt_ddt_cbps, xbt_ddt); - XBT_LOG_CONNECT(xbt_ddt_convert, xbt_ddt); - XBT_LOG_CONNECT(xbt_ddt_create, xbt_ddt); - XBT_LOG_CONNECT(xbt_ddt_exchange, xbt_ddt); - XBT_LOG_CONNECT(xbt_ddt_parse, xbt_ddt); - XBT_LOG_CONNECT(xbt_ddt_lexer, xbt_ddt_parse); - XBT_LOG_CONNECT(xbt_dyn, xbt); - XBT_LOG_CONNECT(xbt_ex, xbt); - XBT_LOG_CONNECT(xbt_fifo, xbt); - XBT_LOG_CONNECT(xbt_graph, xbt); - XBT_LOG_CONNECT(xbt_lib, xbt); - XBT_LOG_CONNECT(xbt_mallocator, xbt); - - XBT_LOG_CONNECT(xbt_matrix, xbt); - XBT_LOG_CONNECT(xbt_parmap, xbt); - XBT_LOG_CONNECT(xbt_parmap_unit, xbt_parmap); - XBT_LOG_CONNECT(xbt_queue, xbt); - XBT_LOG_CONNECT(xbt_set, xbt); - XBT_LOG_CONNECT(xbt_sync, xbt); - XBT_LOG_CONNECT(xbt_sync_os, xbt); - XBT_LOG_CONNECT(xbt_trp, xbt); - XBT_LOG_CONNECT(xbt_trp_meas, xbt_trp); - XBT_LOG_CONNECT(xbt_trp_tcp, xbt_trp); + XBT_LOG_CONNECT(xbt_ddt); + XBT_LOG_CONNECT(xbt_ddt_cbps); + XBT_LOG_CONNECT(xbt_ddt_convert); + XBT_LOG_CONNECT(xbt_ddt_create); + XBT_LOG_CONNECT(xbt_ddt_exchange); + XBT_LOG_CONNECT(xbt_ddt_parse); + XBT_LOG_CONNECT(xbt_ddt_lexer); + XBT_LOG_CONNECT(xbt_dyn); + XBT_LOG_CONNECT(xbt_ex); + XBT_LOG_CONNECT(xbt_fifo); + XBT_LOG_CONNECT(xbt_graph); + XBT_LOG_CONNECT(xbt_lib); + XBT_LOG_CONNECT(xbt_mallocator); + + XBT_LOG_CONNECT(xbt_matrix); + XBT_LOG_CONNECT(xbt_parmap); + XBT_LOG_CONNECT(xbt_parmap_unit); + XBT_LOG_CONNECT(xbt_queue); + XBT_LOG_CONNECT(xbt_set); + XBT_LOG_CONNECT(xbt_sync); + XBT_LOG_CONNECT(xbt_sync_os); + XBT_LOG_CONNECT(xbt_trp); + XBT_LOG_CONNECT(xbt_trp_meas); + XBT_LOG_CONNECT(xbt_trp_tcp); #ifdef simgrid_EXPORTS /* The following categories are only defined in libsimgrid */ /* gras (sg) */ - XBT_LOG_CONNECT(gras_trp_sg, gras_trp); + XBT_LOG_CONNECT(gras_trp_sg); /* bindings */ #ifdef HAVE_LUA - XBT_LOG_CONNECT(lua, bindings); - XBT_LOG_CONNECT(lua_comm, bindings); - XBT_LOG_CONNECT(lua_host, bindings); - XBT_LOG_CONNECT(lua_platf, bindings); - XBT_LOG_CONNECT(lua_process, bindings); - XBT_LOG_CONNECT(lua_state_cloner, bindings); - XBT_LOG_CONNECT(lua_task, bindings); - XBT_LOG_CONNECT(lua_utils, bindings); + XBT_LOG_CONNECT(lua); + XBT_LOG_CONNECT(lua_comm); + XBT_LOG_CONNECT(lua_host); + XBT_LOG_CONNECT(lua_platf); + XBT_LOG_CONNECT(lua_process); + XBT_LOG_CONNECT(lua_state_cloner); + XBT_LOG_CONNECT(lua_task); + XBT_LOG_CONNECT(lua_utils); #endif /* instr */ #ifdef HAVE_TRACING - XBT_LOG_CONNECT(instr_paje_trace, instr); - XBT_LOG_CONNECT(instr_smpi, instr); - XBT_LOG_CONNECT(instr_surf, instr); + XBT_LOG_CONNECT(instr_paje_trace); + XBT_LOG_CONNECT(instr_smpi); + XBT_LOG_CONNECT(instr_surf); #endif /* jedule */ #ifdef HAVE_JEDULE - XBT_LOG_CONNECT(jed_out, jedule); - XBT_LOG_CONNECT(jed_sd, jedule); + XBT_LOG_CONNECT(jed_out); + XBT_LOG_CONNECT(jed_sd); #endif /* mc */ #ifdef HAVE_MC - XBT_LOG_CONNECT(mc_checkpoint, mc); - XBT_LOG_CONNECT(mc_dpor, mc); - XBT_LOG_CONNECT(mc_global, mc); - XBT_LOG_CONNECT(mc_liveness, mc); - XBT_LOG_CONNECT(mc_memory, mc); - XBT_LOG_CONNECT(mc_memory_map, mc); - XBT_LOG_CONNECT(mc_request, mc); + XBT_LOG_CONNECT(mc_checkpoint); + XBT_LOG_CONNECT(mc_dpor); + XBT_LOG_CONNECT(mc_global); + XBT_LOG_CONNECT(mc_liveness); + XBT_LOG_CONNECT(mc_memory); + XBT_LOG_CONNECT(mc_memory_map); + XBT_LOG_CONNECT(mc_request); #endif /* msg */ - XBT_LOG_CONNECT(msg_action, msg); - XBT_LOG_CONNECT(msg_gos, msg); - XBT_LOG_CONNECT(msg_kernel, msg); - XBT_LOG_CONNECT(msg_mailbox, msg); - XBT_LOG_CONNECT(msg_process, msg); - XBT_LOG_CONNECT(msg_task, msg); + XBT_LOG_CONNECT(msg_action); + XBT_LOG_CONNECT(msg_gos); + XBT_LOG_CONNECT(msg_kernel); + XBT_LOG_CONNECT(msg_mailbox); + XBT_LOG_CONNECT(msg_process); + XBT_LOG_CONNECT(msg_task); /* simdag */ - XBT_LOG_CONNECT(sd_daxparse, sd); + XBT_LOG_CONNECT(sd_daxparse); #ifdef HAVE_GRAPHVIZ - XBT_LOG_CONNECT(sd_dotparse, sd); + XBT_LOG_CONNECT(sd_dotparse); #endif - XBT_LOG_CONNECT(sd_kernel, sd); - XBT_LOG_CONNECT(sd_task, sd); - XBT_LOG_CONNECT(sd_workstation, sd); + XBT_LOG_CONNECT(sd_kernel); + XBT_LOG_CONNECT(sd_task); + XBT_LOG_CONNECT(sd_workstation); /* simix */ - XBT_LOG_CONNECT(simix_context, simix); - XBT_LOG_CONNECT(simix_deployment, simix); - XBT_LOG_CONNECT(simix_environment, simix); - XBT_LOG_CONNECT(simix_host, simix); - XBT_LOG_CONNECT(simix_io, simix); - XBT_LOG_CONNECT(simix_kernel, simix); - XBT_LOG_CONNECT(simix_network, simix); - XBT_LOG_CONNECT(simix_process, simix); - XBT_LOG_CONNECT(simix_smurf, simix); - XBT_LOG_CONNECT(simix_synchro, simix); + XBT_LOG_CONNECT(simix_context); + XBT_LOG_CONNECT(simix_deployment); + XBT_LOG_CONNECT(simix_environment); + XBT_LOG_CONNECT(simix_host); + XBT_LOG_CONNECT(simix_io); + XBT_LOG_CONNECT(simix_kernel); + XBT_LOG_CONNECT(simix_network); + XBT_LOG_CONNECT(simix_process); + XBT_LOG_CONNECT(simix_smurf); + XBT_LOG_CONNECT(simix_synchro); /* smpi */ /* SMPI categories are connected in smpi_global.c */ /* surf */ - XBT_LOG_CONNECT(random, surf); - XBT_LOG_CONNECT(surf_config, surf); - XBT_LOG_CONNECT(surf_cpu, surf); - XBT_LOG_CONNECT(surf_cpu_ti, surf); - XBT_LOG_CONNECT(surf_kernel, surf); - XBT_LOG_CONNECT(surf_lagrange, surf); - XBT_LOG_CONNECT(surf_lagrange_dichotomy, surf_lagrange); - XBT_LOG_CONNECT(surf_maxmin, surf); - XBT_LOG_CONNECT(surf_network, surf); + XBT_LOG_CONNECT(random); + XBT_LOG_CONNECT(surf_config); + XBT_LOG_CONNECT(surf_cpu); + XBT_LOG_CONNECT(surf_cpu_ti); + XBT_LOG_CONNECT(surf_kernel); + XBT_LOG_CONNECT(surf_lagrange); + XBT_LOG_CONNECT(surf_lagrange_dichotomy); + XBT_LOG_CONNECT(surf_maxmin); + XBT_LOG_CONNECT(surf_network); #ifdef HAVE_GTNETS - XBT_LOG_CONNECT(surf_network_gtnets, surf); + XBT_LOG_CONNECT(surf_network_gtnets); #endif #ifdef HAVE_NS3 - XBT_LOG_CONNECT(surf_network_ns3, surf); + XBT_LOG_CONNECT(surf_network_ns3); #endif - XBT_LOG_CONNECT(surf_parse, surf); - XBT_LOG_CONNECT(surf_route, surf); - XBT_LOG_CONNECT(surf_routing_generic, surf_route); - XBT_LOG_CONNECT(surf_route_cluster, surf); - XBT_LOG_CONNECT(surf_route_dijkstra, surf); - XBT_LOG_CONNECT(surf_route_floyd, surf); - XBT_LOG_CONNECT(surf_route_full, surf); - XBT_LOG_CONNECT(surf_route_none, surf); - XBT_LOG_CONNECT(surf_route_rulebased, surf); - XBT_LOG_CONNECT(surf_route_vivaldi, surf); - XBT_LOG_CONNECT(surf_storage, surf); - XBT_LOG_CONNECT(surf_trace, surf); - XBT_LOG_CONNECT(surf_workstation, surf); + XBT_LOG_CONNECT(surf_parse); + XBT_LOG_CONNECT(surf_route); + XBT_LOG_CONNECT(surf_routing_generic); + XBT_LOG_CONNECT(surf_route_cluster); + XBT_LOG_CONNECT(surf_route_dijkstra); + XBT_LOG_CONNECT(surf_route_floyd); + XBT_LOG_CONNECT(surf_route_full); + XBT_LOG_CONNECT(surf_route_none); + XBT_LOG_CONNECT(surf_route_rulebased); + XBT_LOG_CONNECT(surf_route_vivaldi); + XBT_LOG_CONNECT(surf_storage); + XBT_LOG_CONNECT(surf_trace); + XBT_LOG_CONNECT(surf_workstation); #endif /* simgrid_EXPORTS */ } diff --git a/tools/gras/stub_generator.c b/tools/gras/stub_generator.c index e082e156fa..1cd58eefe4 100644 --- a/tools/gras/stub_generator.c +++ b/tools/gras/stub_generator.c @@ -95,7 +95,7 @@ int main(int argc, char *argv[]) char *deployment_file = NULL; int i; - XBT_LOG_CONNECT(stubgen, gras); + XBT_LOG_CONNECT(stubgen); xbt_binary_name=xbt_strdup(argv[0]); -- 2.20.1