From: Samuel Lepetit <samuel.lepetit@inria.fr>
Date: Thu, 14 Jun 2012 20:49:26 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
X-Git-Tag: v3_8~598^2~1
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/8cbf22c982842e3e988125fef8f898dec699097b?hp=-c

Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
---

8cbf22c982842e3e988125fef8f898dec699097b
diff --combined src/msg/msg_vm.c
index b8e800fea4,f940a2083e..bda366c65c
--- a/src/msg/msg_vm.c
+++ b/src/msg/msg_vm.c
@@@ -149,10 -149,10 +149,10 @@@ void MSG_vm_resume(msg_vm_t vm) 
   * No extra delay occurs. If you want to simulate this too, you want to
   * use a #MSG_process_sleep() or something. I'm not quite sure.
   */
- void MSG_vm_shutdown(msg_vm_t vm) {
-   unsigned int cpt;
+ void MSG_vm_shutdown(msg_vm_t vm)
+ {
    m_process_t process;
-   XBT_DEBUG("%d processes in the VM",xbt_dynar_length(vm->processes));
+   XBT_DEBUG("%lu processes in the VM", xbt_dynar_length(vm->processes));
    while (xbt_dynar_length(vm->processes) > 0) {
    	process = xbt_dynar_get_as(vm->processes,0,m_process_t);
    	MSG_process_kill(process);
@@@ -166,9 -166,9 +166,9 @@@ void MSG_vm_destroy(msg_vm_t vm) 
  	unsigned int cpt;
  	m_process_t process;
  	xbt_dynar_foreach(vm->processes,cpt,process) {
 -		//FIXME: Slow ?
 -		simdata_process_t simdata = simcall_process_get_data(process);
 -		simdata->vm = NULL;
 +	  //FIXME: Slow ?
 +	  simdata_process_t simdata = simcall_process_get_data(process);
 +	  simdata->vm = NULL;
  	}
  	xbt_dynar_free(&vm->processes);
  	xbt_free(vm);