Remove XBT_LOG_CONNECT, it should be useless nowadays.

diff --git a/ChangeLog b/ChangeLog
index 479c24b..8768cc3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,9 @@ SimGrid (3.19) NOT RELEASED YET (target: March 20 2018, 16:15:27 UTC)
  - Execution->setHost() can be called after start() to migrate it.
  - Comm::test_any() is now implemented.
 
+ XBT
+ - Remove XBT_LOG_CONNECT, it should be useless nowadays.
+
  Fixed bugs:
  - #245: migrating an actor does not migrate its execution
 

diff --git a/include/xbt/log.h b/include/xbt/log.h
index 4edbfed..7819e7e 100644 (file)
--- a/include/xbt/log.h
+++ b/include/xbt/log.h
@@ -94,21 +94,10 @@ typedef enum {
  * This is normally done at the first use of the category.
  *
  * It is however necessary to make this connections as early as possible, if we want the category to be listed by
- * --help-log-categories.
- *
- * When possible, the initializations takes place automatically before the start of main().  It's the case when
- * compiling with gcc.
- *
- * For the other cases, you can use the XBT_LOG_CONNECT(cat) macro to force early initialization.  See, for example,
- * in xbt/log.c, the function xbt_log_connect_categories().
+ * --help-log-categories. We use constructor attributes for these initializations to take place automatically before the
+ * start of main().
  */
 
-#define XBT_LOG_CONNECT(cat)                    \
-  if (1) {                                      \
-    extern void _XBT_LOGV_CTOR(cat)(void);      \
-    _XBT_LOGV_CTOR(cat)();                      \
-  } else ((void)0)
-
 /* XBT_LOG_NEW_SUBCATEGORY_helper:
  * Implementation of XBT_LOG_NEW_SUBCATEGORY, which must declare "extern parent" in addition to avoid an extra
  * declaration of root when XBT_LOG_NEW_SUBCATEGORY is called by XBT_LOG_NEW_CATEGORY */

diff --git a/src/bindings/java/jmsg.cpp b/src/bindings/java/jmsg.cpp
index b821c47..acdd302 100644 (file)
--- a/src/bindings/java/jmsg.cpp
+++ b/src/bindings/java/jmsg.cpp
@@ -1,6 +1,6 @@
 /* Java Wrappers to the MSG API.                                            */
 
-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -92,9 +92,6 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, j
 {
   int argc = 0;
 
-  XBT_LOG_CONNECT(java);
-  XBT_LOG_CONNECT(jtrace);
-
   env->GetJavaVM(&__java_vm);
 
   simgrid::kernel::context::factory_initializer = &simgrid::kernel::context::java_factory;

diff --git a/src/mc/checker/simgrid_mc.cpp b/src/mc/checker/simgrid_mc.cpp
index 277dead..af02035 100644 (file)
--- a/src/mc/checker/simgrid_mc.cpp
+++ b/src/mc/checker/simgrid_mc.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2017. The SimGrid Team.
+/* Copyright (c) 2015-2018. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -53,7 +53,6 @@ static std::unique_ptr<simgrid::mc::Checker> createChecker(simgrid::mc::Session&
 int main(int argc, char** argv)
 {
   using simgrid::mc::Session;
-  XBT_LOG_CONNECT(mc_main);
 
   try {
     if (argc < 2)

diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp
index 0407a77..ae64e42 100644 (file)
--- a/src/smpi/internals/smpi_global.cpp
+++ b/src/smpi/internals/smpi_global.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -401,37 +401,6 @@ void smpi_global_destroy()
   smpi_free_static();
 }
 
-extern "C" {
-
-static void smpi_init_logs(){
-
-  /* Connect log categories.  See xbt/log.c */
-
-  XBT_LOG_CONNECT(smpi);  /* Keep this line as soon as possible in this function: xbt_log_appender_file.c depends on it
-                             DO NOT connect this in XBT or so, or it will be useless to xbt_log_appender_file.c */
-  XBT_LOG_CONNECT(instr_smpi);
-  XBT_LOG_CONNECT(smpi_bench);
-  XBT_LOG_CONNECT(smpi_coll);
-  XBT_LOG_CONNECT(smpi_colls);
-  XBT_LOG_CONNECT(smpi_comm);
-  XBT_LOG_CONNECT(smpi_datatype);
-  XBT_LOG_CONNECT(smpi_dvfs);
-  XBT_LOG_CONNECT(smpi_group);
-  XBT_LOG_CONNECT(smpi_host);
-  XBT_LOG_CONNECT(smpi_kernel);
-  XBT_LOG_CONNECT(smpi_mpi);
-  XBT_LOG_CONNECT(smpi_memory);
-  XBT_LOG_CONNECT(smpi_op);
-  XBT_LOG_CONNECT(smpi_pmpi);
-  XBT_LOG_CONNECT(smpi_process);
-  XBT_LOG_CONNECT(smpi_request);
-  XBT_LOG_CONNECT(smpi_replay);
-  XBT_LOG_CONNECT(smpi_rma);
-  XBT_LOG_CONNECT(smpi_shared);
-  XBT_LOG_CONNECT(smpi_utils);
-}
-}
-
 static void smpi_init_options(){
   // return if already called
   if (smpi_cpu_threshold > -1)
@@ -675,7 +644,6 @@ int smpi_main(const char* executable, int argc, char *argv[])
 
 // Called either directly from the user code, or from the code called by smpirun
 void SMPI_init(){
-  smpi_init_logs();
   smpi_init_options();
   smpi_global_init();
   smpi_check_options();

diff --git a/src/surf/trace_mgr_test.cpp b/src/surf/trace_mgr_test.cpp
index 823baf8..4bdb1d7 100644 (file)
--- a/src/surf/trace_mgr_test.cpp
+++ b/src/surf/trace_mgr_test.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017. The SimGrid Team. All rights reserved.               */
+/* Copyright (c) 2017-2018. The SimGrid Team. All rights reserved.               */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -157,7 +157,6 @@ static bool init_function()
 
 int main(int argc, char** argv)
 {
-  XBT_LOG_CONNECT(unit);
   xbt_log_init(&argc, argv);
   return ::boost::unit_test::unit_test_main(&init_function, argc, argv);
 }

diff --git a/src/xbt/log.c b/src/xbt/log.c
index 767f883..3073e99 100644 (file)
--- a/src/xbt/log.c
+++ b/src/xbt/log.c
@@ -1,6 +1,6 @@
 /* log - a generic logging facility in the spirit of log4j                  */
 
-/* Copyright (c) 2004-2017. The SimGrid Team.
+/* Copyright (c) 2004-2018. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -92,181 +92,6 @@ void xbt_log_preinit(void)
   log_cat_init_mutex = xbt_os_mutex_init();
 }
 
-static void xbt_log_connect_categories(void)
-{
-  /* Connect our log channels: that must be done manually under windows */
-  /* Also permit that they are correctly listed by xbt_log_help_categories() */
-
-  /* xbt */
-  XBT_LOG_CONNECT(xbt);
-  XBT_LOG_CONNECT(log);
-  XBT_LOG_CONNECT(module);
-  XBT_LOG_CONNECT(replay);
-  XBT_LOG_CONNECT(xbt_cfg);
-  XBT_LOG_CONNECT(xbt_dict);
-  XBT_LOG_CONNECT(xbt_dict_cursor);
-  XBT_LOG_CONNECT(xbt_dict_elm);
-  XBT_LOG_CONNECT(xbt_dyn);
-  XBT_LOG_CONNECT(xbt_ex);
-  XBT_LOG_CONNECT(xbt_automaton);
-  XBT_LOG_CONNECT(xbt_backtrace);
-  XBT_LOG_CONNECT(xbt_exception);
-  XBT_LOG_CONNECT(xbt_graph);
-  XBT_LOG_CONNECT(xbt_mallocator);
-  XBT_LOG_CONNECT(xbt_memory_map);
-  XBT_LOG_CONNECT(xbt_parmap);
-  XBT_LOG_CONNECT(xbt_sync);
-  XBT_LOG_CONNECT(xbt_sync_os);
-
-#ifdef simgrid_EXPORTS
-  /* The following categories are only defined in libsimgrid */
-
-  /* bindings */
-#if SIMGRID_HAVE_LUA
-  XBT_LOG_CONNECT(lua);
-  XBT_LOG_CONNECT(lua_host);
-  XBT_LOG_CONNECT(lua_platf);
-  XBT_LOG_CONNECT(lua_debug);
-#endif
-
-  /* instr */
-  XBT_LOG_CONNECT(instr);
-  XBT_LOG_CONNECT(instr_api);
-  XBT_LOG_CONNECT(instr_config);
-  XBT_LOG_CONNECT(instr_msg);
-  XBT_LOG_CONNECT(instr_msg_process);
-  XBT_LOG_CONNECT(instr_paje_containers);
-  XBT_LOG_CONNECT(instr_paje_header);
-  XBT_LOG_CONNECT(instr_paje_trace);
-  XBT_LOG_CONNECT(instr_paje_types);
-  XBT_LOG_CONNECT(instr_paje_values);
-  XBT_LOG_CONNECT(instr_resource);
-  XBT_LOG_CONNECT(instr_routing);
-  XBT_LOG_CONNECT(instr_surf);
-
-  /* jedule */
-#if SIMGRID_HAVE_JEDULE
-  XBT_LOG_CONNECT(jedule);
-  XBT_LOG_CONNECT(jed_sd);
-#endif
-
-  /* mc */
-#if SIMGRID_HAVE_MC
-  XBT_LOG_CONNECT(mc);
-  XBT_LOG_CONNECT(mc_checkpoint);
-  XBT_LOG_CONNECT(mc_comm_determinism);
-  XBT_LOG_CONNECT(mc_compare);
-  XBT_LOG_CONNECT(mc_dwarf);
-  XBT_LOG_CONNECT(mc_hash);
-  XBT_LOG_CONNECT(mc_liveness);
-  XBT_LOG_CONNECT(mc_memory);
-  XBT_LOG_CONNECT(mc_page_snapshot);
-  XBT_LOG_CONNECT(mc_request);
-  XBT_LOG_CONNECT(mc_safety);
-  XBT_LOG_CONNECT(mc_VisitedState);
-  XBT_LOG_CONNECT(mc_client);
-  XBT_LOG_CONNECT(mc_client_api);
-  XBT_LOG_CONNECT(mc_comm_pattern);
-  XBT_LOG_CONNECT(mc_process);
-  XBT_LOG_CONNECT(mc_protocol);
-  XBT_LOG_CONNECT(mc_Channel);
-  XBT_LOG_CONNECT(mc_ModelChecker);
-  XBT_LOG_CONNECT(mc_RegionSnaphot);
-  XBT_LOG_CONNECT(mc_Session);
-  XBT_LOG_CONNECT(mc_state);
-#endif
-  XBT_LOG_CONNECT(mc_global);
-  XBT_LOG_CONNECT(mc_config);
-  XBT_LOG_CONNECT(mc_record);
-
-  /* msg */
-  XBT_LOG_CONNECT(msg);
-  XBT_LOG_CONNECT(msg_action);
-  XBT_LOG_CONNECT(msg_gos);
-  XBT_LOG_CONNECT(msg_io);
-  XBT_LOG_CONNECT(msg_kernel);
-  XBT_LOG_CONNECT(msg_mailbox);
-  XBT_LOG_CONNECT(msg_process);
-  XBT_LOG_CONNECT(msg_synchro);
-  XBT_LOG_CONNECT(msg_task);
-  XBT_LOG_CONNECT(msg_vm);
-
-  /* s4u */
-  XBT_LOG_CONNECT(s4u);
-  XBT_LOG_CONNECT(s4u_activity);
-  XBT_LOG_CONNECT(s4u_actor);
-  XBT_LOG_CONNECT(s4u_netzone);
-  XBT_LOG_CONNECT(s4u_channel);
-  XBT_LOG_CONNECT(s4u_comm);
-  XBT_LOG_CONNECT(s4u_file);
-  XBT_LOG_CONNECT(s4u_link);
-  XBT_LOG_CONNECT(s4u_vm);
-
-  /* sg */
-  XBT_LOG_CONNECT(sg_host);
-
-  /* simdag */
-  XBT_LOG_CONNECT(sd);
-  XBT_LOG_CONNECT(sd_daxparse);
-#if HAVE_GRAPHVIZ
-  XBT_LOG_CONNECT(sd_dotparse);
-#endif
-  XBT_LOG_CONNECT(sd_kernel);
-  XBT_LOG_CONNECT(sd_task);
-
-  /* simix */
-  XBT_LOG_CONNECT(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_mailbox);
-  XBT_LOG_CONNECT(simix_network);
-  XBT_LOG_CONNECT(simix_process);
-  XBT_LOG_CONNECT(simix_popping);
-  XBT_LOG_CONNECT(simix_synchro);
-
-  /* smpi */
-  /* SMPI categories are connected in smpi_global.c */
-
-  /* surf */
-  XBT_LOG_CONNECT(surf);
-  XBT_LOG_CONNECT(surf_config);
-  XBT_LOG_CONNECT(surf_cpu);
-  XBT_LOG_CONNECT(surf_cpu_cas);
-  XBT_LOG_CONNECT(surf_cpu_ti);
-  XBT_LOG_CONNECT(surf_energy);
-  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);
-#if SIMGRID_HAVE_NS3
-  XBT_LOG_CONNECT(ns3);
-#endif
-  XBT_LOG_CONNECT(surf_parse);
-  XBT_LOG_CONNECT(surf_plugin_load);
-  XBT_LOG_CONNECT(surf_route);
-  XBT_LOG_CONNECT(surf_routing_generic);
-  XBT_LOG_CONNECT(surf_route_cluster);
-  XBT_LOG_CONNECT(surf_route_cluster_torus);
-  XBT_LOG_CONNECT(surf_route_cluster_dragonfly);
-  XBT_LOG_CONNECT(surf_route_dijkstra);
-  XBT_LOG_CONNECT(surf_route_fat_tree);
-  XBT_LOG_CONNECT(surf_route_floyd);
-  XBT_LOG_CONNECT(surf_route_full);
-  XBT_LOG_CONNECT(surf_route_none);
-  XBT_LOG_CONNECT(surf_route_vivaldi);
-  XBT_LOG_CONNECT(surf_storage);
-  XBT_LOG_CONNECT(surf_trace);
-  XBT_LOG_CONNECT(surf_vm);
-  XBT_LOG_CONNECT(surf_host);
-
-#endif /* simgrid_EXPORTS */
-}
-
 static void xbt_log_help(void);
 static void xbt_log_help_categories(void);
 

diff --git a/tools/graphicator/graphicator.c b/tools/graphicator/graphicator.c
index a32e74c..7074e13 100644 (file)
--- a/tools/graphicator/graphicator.c
+++ b/tools/graphicator/graphicator.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2015. The SimGrid Team.
+/* Copyright (c) 2008-2018. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -11,7 +11,6 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(graphicator, "Graphicator Logging System");
 
 int main(int argc, char **argv)
 {
-  XBT_LOG_CONNECT(graphicator);
   MSG_init(&argc, argv);
 
   xbt_assert(argc == 3, "Usage: %s <platform_file.xml> <graphviz_file.dot>", argv[0]);