various cosmetics improvements

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7293 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/Makefile.am b/src/Makefile.am
index e2bc59d..15a6455 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -330,13 +330,7 @@ endif
 ### Declare the library content
 ###
 
-if HAVE_RUBY
-  libruby=simgrid_ruby.la
-else
-  libruby=
-endif
-
-lib_LTLIBRARIES= libsimgrid.la libgras.la libsmpi.la $(libruby)
+lib_LTLIBRARIES= libsimgrid.la libgras.la libsmpi.la 
 
 gras_sources=$(XBT_SRC) $(GRAS_COMMON_SRC) $(GRAS_RL_SRC) $(AMOK_SRC)
 simgrid_sources=$(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) \
@@ -357,6 +351,7 @@ libsmpi_la_SOURCES = $(SMPI_SRC)
 libsmpi_la_LDFLAGS = $(VERSION_INFO) @SMPI_DEP@ @LD_DYNAMIC_FLAGS@ -lm
 
 if HAVE_RUBY
+lib_LTLIBRARIES += simgrid_ruby.la
 simgrid_ruby_la_LIBADD = libsimgrid.la
 simgrid_ruby_la_SOURCES = bindings/ruby/simgrid_ruby.c
 simgrid_ruby_la_LDFLAGS = $(VERSION_INFO) @LD_DYNAMIC_FLAGS@ -lm -module
@@ -392,7 +387,7 @@ else
 EXTRA_DIST+=$(JMSG_C_SRC) $(JMSG_JAVA_SRC) $(MSG_SRC)
 endif
 
-LUA_SRC= simix/smx_context_lua.c bindings/lua/Msglua.c
+LUA_SRC= simix/smx_context_lua.c bindings/lua/simgrid_lua.c #bindings/lua/Msglua.c 
 if HAVE_LUA
   simgrid_sources += $(LUA_SRC)
 else

diff --git a/src/simix/smx_deployment.c b/src/simix/smx_deployment.c
index f956bce..e8c4192 100644 (file)
--- a/src/simix/smx_deployment.c
+++ b/src/simix/smx_deployment.c
@@ -86,7 +86,7 @@ static void parse_process_finalize(void)
     else
       process = SIMIX_process_create(parse_argv[0], parse_code, NULL, parse_host, parse_argc, parse_argv,       /*the props */
                                      current_property_set);
-    /* verify if process has been created */
+    /* verify if process has been created (won't be the case if the host is currently dead, but that's fine) */
     if (!process) {
       xbt_free(parse_host);
       return;

diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c
index 8eb92c7..d747459 100644 (file)
--- a/src/simix/smx_global.c
+++ b/src/simix/smx_global.c
@@ -321,6 +321,7 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed)
   if (xbt_swag_size(simix_global->process_to_run) && (elapsed_time > 0)) {
     DEBUG0("**************************************************");
   }
+  DEBUG1("%d processes in the to_run list",xbt_swag_size(simix_global->process_to_run));
 
   while ((process = xbt_swag_extract(simix_global->process_to_run))) {
     DEBUG2("Scheduling %s on %s", process->name, process->smx_host->name);