From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Thu, 20 Sep 2007 16:03:07 +0000 (+0000)
Subject: Ok, you won't believe this one. Visual seems to break on structures containing a... 
X-Git-Tag: v3.3~1143
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/9999e6d0e6a45e7d1e73df48f7542f15e88e70ed?hp=58c6c5c7559e29d7671bd95e9e065a1ab60e83cf

Ok, you won't believe this one. Visual seems to break on structures containing a field which name begins with 's_' since it uses this prefix for internal purpose around debuging. How beautiful is the windows world...

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

diff --git a/src/simix/private.h b/src/simix/private.h
index b9d04994fc..dedb6bad4b 100644
--- a/src/simix/private.h
+++ b/src/simix/private.h
@@ -48,7 +48,7 @@ extern SIMIX_Global_t simix_global;
 /******************************* Process *************************************/
 
 typedef struct s_smx_simdata_process {
-  smx_host_t s_host;		/* the host on which the process is running */
+  smx_host_t smx_host;		/* the host on which the process is running */
   xbt_context_t context;	/* the context that executes the scheduler fonction */
   int blocked;
   int suspended;
diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c
index 311f0abe26..e381b94e03 100644
--- a/src/simix/smx_global.c
+++ b/src/simix/smx_global.c
@@ -147,7 +147,7 @@ void SIMIX_display_process_status(void)
 
     asprintf(&who, "%s on %s: %s",
 	     process->name,
-	     p_simdata->s_host->name,
+	     p_simdata->smx_host->name,
 	     (process->simdata->blocked) ? "[BLOCKED] "
 	     : ((process->simdata->suspended) ? "[SUSPENDED] " : ""));
 
@@ -221,7 +221,7 @@ void __SIMIX_main(void)
       xbt_fifo_foreach(smx_action->cond_list, _cursor, cond, smx_cond_t) {
 	xbt_swag_foreach(process, cond->sleeping) {
 	  DEBUG2("\t preparing to wake up %s on %s",
-		 process->name, process->simdata->s_host->name);
+		 process->name, process->simdata->smx_host->name);
 	}
 	SIMIX_cond_broadcast(cond);
 	/* remove conditional from action */
@@ -236,7 +236,7 @@ void __SIMIX_main(void)
       xbt_fifo_foreach(smx_action->cond_list, _cursor, cond, smx_cond_t) {
 	xbt_swag_foreach(process, cond->sleeping) {
 	  DEBUG2("\t preparing to wake up %s on %s",
-		 process->name, process->simdata->s_host->name);
+		 process->name, process->simdata->smx_host->name);
 	}
 	SIMIX_cond_broadcast(cond);
 	/* remove conditional from action */
@@ -338,7 +338,7 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed)
   }
   while ((process = xbt_swag_extract(simix_global->process_to_run))) {
     DEBUG2("Scheduling %s on %s",
-	   process->name, process->simdata->s_host->name);
+	   process->name, process->simdata->smx_host->name);
     simix_global->current_process = process;
     xbt_context_schedule(process->simdata->context);
     /*       fflush(NULL); */
@@ -386,7 +386,7 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed)
       if (fun == SIMIX_process_kill) {
 	process = arg;
 	DEBUG2("Killing %s on %s", process->name,
-	       process->simdata->s_host->name);
+	       process->simdata->smx_host->name);
 	SIMIX_process_kill(process);
       }
     }
diff --git a/src/simix/smx_process.c b/src/simix/smx_process.c
index 19bc82e3eb..495e879311 100644
--- a/src/simix/smx_process.c
+++ b/src/simix/smx_process.c
@@ -27,7 +27,7 @@ void SIMIX_process_cleanup(void *arg)
   xbt_swag_remove(arg, simix_global->process_list);
   xbt_swag_remove(arg, simix_global->process_to_run);
   xbt_swag_remove(arg,
-		  ((smx_process_t) arg)->simdata->s_host->simdata->
+		  ((smx_process_t) arg)->simdata->smx_host->simdata->
 		  process_list);
   free(((smx_process_t) arg)->name);
   ((smx_process_t) arg)->name = NULL;
@@ -64,7 +64,7 @@ smx_process_t SIMIX_process_create(const char *name,
   xbt_assert0(((code != NULL) && (host != NULL)), "Invalid parameters");
   /* Simulator Data */
 
-  simdata->s_host = host;
+  simdata->smx_host = host;
   simdata->mutex = NULL;
   simdata->cond = NULL;
   simdata->argc = argc;
@@ -126,7 +126,7 @@ void SIMIX_jprocess_create(const char *name, smx_host_t host,
 	 name, host, data, jprocess, jenv);
   xbt_assert0(host, "Invalid parameters");
   /* Simulator Data */
-  simdata->s_host = host;
+  simdata->smx_host = host;
   simdata->mutex = NULL;
   simdata->cond = NULL;
   simdata->argc = 0;
@@ -169,7 +169,7 @@ void SIMIX_process_kill(smx_process_t process)
   smx_simdata_process_t p_simdata = process->simdata;
 
   DEBUG2("Killing process %s on %s", process->name,
-	 p_simdata->s_host->name);
+	 p_simdata->smx_host->name);
 
   /* Cleanup if we were waiting for something */
   if (p_simdata->mutex)
@@ -232,7 +232,7 @@ smx_host_t SIMIX_process_get_host(smx_process_t process)
   xbt_assert0(((process != NULL)
 	       && (process->simdata)), "Invalid parameters");
 
-  return (process->simdata->s_host);
+  return (process->simdata->smx_host);
 }
 
 /**