X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=snapshot-interface.cc;h=5d160e1a837da27677bf441efcdc956e8af8a687;hb=bdef0741b8a01e16946d261bc2a657af5a683b3e;hp=baedf4753a806b5ac47b8079f9227dba4bce3706;hpb=59f0936bdf663c198e36b3b365868bdea8420594;p=model-checker.git diff --git a/snapshot-interface.cc b/snapshot-interface.cc index baedf47..5d160e1 100644 --- a/snapshot-interface.cc +++ b/snapshot-interface.cc @@ -56,15 +56,13 @@ static void SnapshotGlobalSegments(){ //Skip out at the end of the section if (buf[0]=='\n') break; - - sscanf(buf, "%22s %p-%p [%5dK] %c%c%c/%c%c%c SM=%3s %200s\n", &type, &begin, &end, &size, &r, &w, &x, &mr, &mw, &mx, smstr, regionname); + + sscanf(buf, "%22s %p-%p [%5dK] %c%c%c/%c%c%c SM=%3s %200s\n", type, &begin, &end, &size, &r, &w, &x, &mr, &mw, &mx, smstr, regionname); if (w == 'w' && (strstr(regionname, MYBINARYNAME) || strstr(regionname, MYLIBRARYNAME))) { size_t len = ((uintptr_t)end - (uintptr_t)begin) / PAGESIZE; if (len != 0) addMemoryRegionToSnapShot(begin, len); - DEBUG("%s\n", buf); - DEBUG("%45s: %18p - %18p\t%c%c%c%c\n", regionname, begin, end, r, w, x, p); } } pclose(map); @@ -113,11 +111,10 @@ SnapshotStack::~SnapshotStack(){ /** This method returns to the last snapshot before the inputted * sequence number. This function must be called from the model - * checking thread and not from a snapshotted stack. - * @param seqindex is the sequence number to rollback before. + * checking thread and not from a snapshotted stack. + * @param seqindex is the sequence number to rollback before. * @return is the sequence number we actually rolled back to. */ - int SnapshotStack::backTrackBeforeStep(int seqindex) { while(true) { if (stack->index<=seqindex) { @@ -131,9 +128,7 @@ int SnapshotStack::backTrackBeforeStep(int seqindex) { } } -/** This method takes a snapshot at the given sequence number. - */ - +/** This method takes a snapshot at the given sequence number. */ void SnapshotStack::snapshotStep(int seqindex) { struct stackEntry *tmp=(struct stackEntry *)MYMALLOC(sizeof(struct stackEntry)); tmp->next=stack;