Просмотр исходного кода

cmMem.c : Moved unique id break point comment after where the

unique id is calculated.
master
kevin 11 лет назад
Родитель
Сommit
ed1c13c0ec
1 измененных файлов: 17 добавлений и 13 удалений
  1. 17
    13
      cmMem.c

+ 17
- 13
cmMem.c Просмотреть файл

@@ -176,7 +176,7 @@ cmMmRC_t _cmMmFreeP( cmMm_t* p, void* dataPtr )
176 176
     if( rp == NULL )
177 177
       return cmErrMsg(&p->err,kMissingRecdMmRC,"Unable to locate a tracking record associated with released data area pointer:%p.",dataPtr);
178 178
     /*
179
-    if( rp->uniqueId == 176690 )
179
+    if( rp->uniqueId == 59451 )
180 180
     {
181 181
       cmErrMsg(&p->err,kOkMmRC,"Breakpoint for memory free id:%i.",rp->uniqueId);
182 182
     }
@@ -494,18 +494,7 @@ void* cmMmAllocate(
494 494
    unsigned newByteCnt = newEleCnt * newEleByteCnt;
495 495
    void*    ndp        = _cmMmAllocate(p,orgDataPtr,newByteCnt,flags);
496 496
    
497
-   /*
498
-   if( p->nextId == 189114 )
499
-   {
500
-     cmErrMsg(&p->err,kOkMmRC,"Breakpoint for memory allocation id:%i.",p->nextId);
501
-   }
502
-
503
-   if( (long long)_cmMmDataToBasePtr(ndp,p->guardByteCnt) == 0x7fffed8d0b40 )
504
-   {
505
-     cmErrMsg(&p->err,kOkMmRC,"Breakpoint for memory allocation id:%i.",p->nextId);
506
-   }
507
-   */
508
-
497
+   
509 498
 
510 499
    // if we are tracking changes
511 500
    if( cmIsFlag(p->flags,kTrackMmFl) )
@@ -526,8 +515,23 @@ void* cmMmAllocate(
526 515
          return ndp;
527 516
        }
528 517
 
518
+       // p->nextId is incremented here
529 519
        cmThUIntIncr(&p->nextId,1);
530 520
 
521
+       /*
522
+       if( p->nextId == 2393 )
523
+       {
524
+         cmErrMsg(&p->err,kOkMmRC,"Breakpoint for memory allocation id:%i.",p->nextId);
525
+       }
526
+       */
527
+       /*
528
+         if( (long long)_cmMmDataToBasePtr(ndp,p->guardByteCnt) == 0x7fffed8d0b40 )
529
+         {
530
+         cmErrMsg(&p->err,kOkMmRC,"Breakpoint for memory allocation id:%i.",p->nextId);
531
+         }
532
+       */
533
+
534
+
531 535
        // initialize the new tracking recd
532 536
        rp->dataPtr      = ndp;
533 537
        rp->dataByteCnt  = newByteCnt;

Загрузка…
Отмена
Сохранить