[BACK]Return to monitor_mm.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/Attic/monitor_mm.c between version 1.3 and 1.4

version 1.3, 2002/03/19 10:41:32 version 1.4, 2002/03/25 20:12:10
Line 56 
Line 56 
   
         tmp2 = RB_INSERT(mmtree, head, tmp);          tmp2 = RB_INSERT(mmtree, head, tmp);
         if (tmp2 != NULL)          if (tmp2 != NULL)
                 fatal("mm_make_entry(%p): double address %p->%p(%d)",                  fatal("mm_make_entry(%p): double address %p->%p(%lu)",
                     mm, tmp2, address, size);                      mm, tmp2, address, (u_long)size);
   
         return (tmp);          return (tmp);
 }  }
Line 85 
Line 85 
         address = mmap(NULL, size, PROT_WRITE|PROT_READ, MAP_ANON|MAP_SHARED,          address = mmap(NULL, size, PROT_WRITE|PROT_READ, MAP_ANON|MAP_SHARED,
             -1, 0);              -1, 0);
         if (address == MAP_FAILED)          if (address == MAP_FAILED)
                 fatal("mmap(%d)", size);                  fatal("mmap(%lu)", (u_long)size);
   
         mm->address = address;          mm->address = address;
         mm->size = size;          mm->size = size;
Line 124 
Line 124 
         mm_freelist(mm->mmalloc, &mm->rb_allocated);          mm_freelist(mm->mmalloc, &mm->rb_allocated);
   
         if (munmap(mm->address, mm->size) == -1)          if (munmap(mm->address, mm->size) == -1)
                 fatal("munmap(%p, %d)", mm->address, mm->size);                  fatal("munmap(%p, %lu)", mm->address, (u_long)mm->size);
         if (mm->mmalloc == NULL)          if (mm->mmalloc == NULL)
                 xfree(mm);                  xfree(mm);
         else          else
Line 138 
Line 138 
   
         address = mm_malloc(mm, size);          address = mm_malloc(mm, size);
         if (address == NULL)          if (address == NULL)
                 fatal("%s: mm_malloc(%d)", __FUNCTION__, size);                  fatal("%s: mm_malloc(%lu)", __FUNCTION__, (u_long)size);
         return (address);          return (address);
 }  }
   
Line 223 
Line 223 
   
         /* Check if range does not overlap */          /* Check if range does not overlap */
         if (prev != NULL && MM_ADDRESS_END(prev) > address)          if (prev != NULL && MM_ADDRESS_END(prev) > address)
                 fatal("mm_free: memory corruption: %p(%d) > %p",                  fatal("mm_free: memory corruption: %p(%lu) > %p",
                     prev->address, prev->size, address);                      prev->address, (u_long)prev->size, address);
   
         /* See if we can merge backwards */          /* See if we can merge backwards */
         if (prev != NULL && MM_ADDRESS_END(prev) == address) {          if (prev != NULL && MM_ADDRESS_END(prev) == address) {
Line 246 
Line 246 
                 return;                  return;
   
         if (MM_ADDRESS_END(prev) > mms->address)          if (MM_ADDRESS_END(prev) > mms->address)
                 fatal("mm_free: memory corruption: %p < %p(%d)",                  fatal("mm_free: memory corruption: %p < %p(%lu)",
                     mms->address, prev->address, prev->size);                      mms->address, prev->address, (u_long)prev->size);
         if (MM_ADDRESS_END(prev) != mms->address)          if (MM_ADDRESS_END(prev) != mms->address)
                 return;                  return;
   
Legend:
Removed from v.1.3  
changed lines
  Added in v.1.4