cosmetics (kill unused var, and kill/improve debug outputs)

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

diff --git a/src/xbt/mmalloc/mfree.c b/src/xbt/mmalloc/mfree.c
index 142777b..76b9901 100644 (file)
--- a/src/xbt/mmalloc/mfree.c
+++ b/src/xbt/mmalloc/mfree.c
@@ -19,7 +19,7 @@ void
 __mmalloc_free (struct mdesc *mdp, void *ptr)
 {
   int type;
 __mmalloc_free (struct mdesc *mdp, void *ptr)
 {
   int type;

-  size_t block;//, blocks; unused variable?
+  size_t block;

   register size_t i;
   struct list *prev, *next;
 
   register size_t i;
   struct list *prev, *next;
 

diff --git a/src/xbt/mmalloc/mrealloc.c b/src/xbt/mmalloc/mrealloc.c
index 1b788ec..fd8eb82 100644 (file)
--- a/src/xbt/mmalloc/mrealloc.c
+++ b/src/xbt/mmalloc/mrealloc.c
@@ -35,10 +35,10 @@ void* mrealloc (void *md, void *ptr, size_t size) {
 
   mdp = MD_TO_MDP (md);
 
 
   mdp = MD_TO_MDP (md);
 

-  printf("(%s)realloc %p to %d...",xbt_thread_self_name(),ptr,(int)size);
-  if ((char*)ptr < (char*)mdp->heapbase || BLOCK(ptr) > mdp->heapsize ) {
+  //printf("(%s)realloc %p to %d...",xbt_thread_self_name(),ptr,(int)size);

 
 

-    printf("FIXME. Ouch, this pointer is not mine. I will malloc it instead of reallocing it.\n");
+  if ((char*)ptr < (char*)mdp->heapbase || BLOCK(ptr) > mdp->heapsize ) {
+    printf("FIXME. Ouch, this pointer is not mine. I will malloc it instead of reallocing it. (please report this bug)\n");

     result = mmalloc(md,size);
     abort();
     return result;
     result = mmalloc(md,size);
     abort();
     return result;


@@ -61,7 +61,7 @@ void* mrealloc (void *md, void *ptr, size_t size) {
     if (size <= BLOCKSIZE / 2)
     {
       UNLOCK(mdp);
     if (size <= BLOCKSIZE / 2)
     {
       UNLOCK(mdp);

-      printf("(%s) alloc large block...",xbt_thread_self_name());
+      //printf("(%s) alloc large block...",xbt_thread_self_name());

       result = mmalloc (md, size);
       if (result != NULL)
       {
       result = mmalloc (md, size);
       if (result != NULL)
       {


@@ -78,7 +78,7 @@ void* mrealloc (void *md, void *ptr, size_t size) {
     if (blocks < mdp -> heapinfo[block].busy.info.size)
     {
       /* The new size is smaller; return excess memory to the free list. */
     if (blocks < mdp -> heapinfo[block].busy.info.size)
     {
       /* The new size is smaller; return excess memory to the free list. */

-      printf("(%s) return excess memory...",xbt_thread_self_name());
+      //printf("(%s) return excess memory...",xbt_thread_self_name());

       mdp -> heapinfo[block + blocks].busy.type = 0;
       mdp -> heapinfo[block + blocks].busy.info.size
       = mdp -> heapinfo[block].busy.info.size - blocks;
       mdp -> heapinfo[block + blocks].busy.type = 0;
       mdp -> heapinfo[block + blocks].busy.info.size
       = mdp -> heapinfo[block].busy.info.size - blocks;


@@ -119,12 +119,12 @@ void* mrealloc (void *md, void *ptr, size_t size) {
         to base two of the fragment size.  */
     if (size > (size_t) (1 << (type - 1)) && size <= (size_t) (1 << type)) {
       /* The new size is the same kind of fragment.  */
         to base two of the fragment size.  */
     if (size > (size_t) (1 << (type - 1)) && size <= (size_t) (1 << type)) {
       /* The new size is the same kind of fragment.  */

-      printf("(%s) new size is same kind of fragment...",xbt_thread_self_name());
+      //printf("(%s) new size is same kind of fragment...",xbt_thread_self_name());

       result = ptr;
     } else {
       /* The new size is different; allocate a new space,
             and copy the lesser of the new size and the old. */
       result = ptr;
     } else {
       /* The new size is different; allocate a new space,
             and copy the lesser of the new size and the old. */

-      printf("(%s) new size is different...",xbt_thread_self_name());
+      //printf("(%s) new size is different...",xbt_thread_self_name());

 
       UNLOCK(mdp);
       result = mmalloc (md, size);
 
       UNLOCK(mdp);
       result = mmalloc (md, size);


@@ -136,6 +136,6 @@ void* mrealloc (void *md, void *ptr, size_t size) {
     }
     break;
   }
     }
     break;
   }

-  printf("(%s) Done reallocing: %p\n",xbt_thread_self_name(),result);fflush(stdout);
+  //printf("(%s) Done reallocing: %p\n",xbt_thread_self_name(),result);fflush(stdout);

   return (result);
 }
   return (result);
 }

diff --git a/tools/tesh/run_context.c b/tools/tesh/run_context.c
index 59f787e..eded8b5 100644 (file)
--- a/tools/tesh/run_context.c
+++ b/tools/tesh/run_context.c
@@ -353,8 +353,8 @@ static void *thread_reader(void *r)
   /* let this thread wait for the child so that the main thread can detect the timeout without blocking on the wait */
   got_pid = waitpid(rctx->pid, &rctx->status, 0);
   if (got_pid != rctx->pid) {
   /* let this thread wait for the child so that the main thread can detect the timeout without blocking on the wait */
   got_pid = waitpid(rctx->pid, &rctx->status, 0);
   if (got_pid != rctx->pid) {

-    perror(bprintf("(%s) Cannot wait for the child %s (got pid %d where pid %d were expected;rctx=%p;status=%d)",
-                  xbt_thread_self_name(), rctx->cmd, (int)got_pid, (int)rctx->pid,rctx,rctx->status));
+    perror(bprintf("(%s) Cannot wait for the child %s (got pid %d where pid %d were expected;status=%d)",
+                  xbt_thread_self_name(), rctx->cmd, (int)got_pid, (int)rctx->pid,rctx->status));

     ERROR1("Test suite `%s': NOK (system error)", testsuite_name);
     rctx_armageddon(rctx, 4);
     return NULL;
     ERROR1("Test suite `%s': NOK (system error)", testsuite_name);
     rctx_armageddon(rctx, 4);
     return NULL;