model: check data races during release sequence fixup

[model-checker.git] / snapshot-interface.cc

diff --git a/snapshot-interface.cc b/snapshot-interface.cc
index 4def5c88c56d7baa2e1f44bec06c9680671a4779..47fafa5b0641f8865cb279c47f08531e9cbfd4f1 100644 (file)
--- a/snapshot-interface.cc
+++ b/snapshot-interface.cc
@@ -11,16 +11,68 @@
 #include <vector>
 #include <utility>
 #include <inttypes.h>
-
 #include "common.h"
 
+
 #define MYBINARYNAME "model"
 #define MYLIBRARYNAME "libmodel.so"
 #define MAPFILE_FORMAT "/proc/%d/maps"
 
 SnapshotStack * snapshotObject;
 
-void SnapshotGlobalSegments(){
+#ifdef MAC
+/** The SnapshotGlobalSegments function computes the memory regions
+ *     that may contain globals and then configures the snapshotting
+ *     library to snapshot them.
+ */
+static void SnapshotGlobalSegments(){
+       int pid = getpid();
+       char buf[9000], execname[100];
+       FILE *map;
+
+       sprintf(execname, "vmmap -interleaved %d", pid);
+       map=popen(execname, "r");
+
+       if (!map) {
+               perror("popen");
+               exit(EXIT_FAILURE);
+       }
+
+       /* Wait for correct part */
+       while (fgets(buf, sizeof(buf), map)) {
+               if (strstr(buf, "==== regions for process"))
+                       break;
+       }
+
+       while (fgets(buf, sizeof(buf), map)) {
+               char regionname[200] = "";
+               char type[23];
+               char smstr[23];
+               char r, w, x;
+               char mr, mw, mx;
+               int size;
+               void *begin, *end;
+
+               //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);
+
+               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);
+               }
+       }
+       pclose(map);
+}
+#else
+/** The SnapshotGlobalSegments function computes the memory regions
+ *     that may contain globals and then configures the snapshotting
+ *     library to snapshot them.
+ */
+static void SnapshotGlobalSegments(){
        int pid = getpid();
        char buf[9000], filename[100];
        FILE *map;
@@ -41,14 +93,13 @@ void SnapshotGlobalSegments(){
                        size_t len = ((uintptr_t)end - (uintptr_t)begin) / PAGESIZE;
                        if (len != 0)
                                addMemoryRegionToSnapShot(begin, len);
-                       DEBUG("%45s: %18p - %18p\t%c%c%c%c\n", regionname, begin, end, r, w, x, p);
+                       DEBUG("%55s: %18p - %18p\t%c%c%c%c\n", regionname, begin, end, r, w, x, p);
                }
        }
        fclose(map);
 }
+#endif
 
-//class definition of SnapshotStack.....
-//declaration of constructor....
 SnapshotStack::SnapshotStack(){
        SnapshotGlobalSegments();
        stack=NULL;
@@ -57,6 +108,13 @@ SnapshotStack::SnapshotStack(){
 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.
+ * @return is the sequence number we actually rolled back to.
+ */
 int SnapshotStack::backTrackBeforeStep(int seqindex) {
        while(true) {
                if (stack->index<=seqindex) {
@@ -65,13 +123,14 @@ int SnapshotStack::backTrackBeforeStep(int seqindex) {
                        return stack->index;
                }
                struct stackEntry *tmp=stack;
-               MYFREE(tmp);
                stack=stack->next;
+               model_free(tmp);
        }
 }
 
+/** This method takes a snapshot at the given sequence number. */
 void SnapshotStack::snapshotStep(int seqindex) {
-       struct stackEntry *tmp=(struct stackEntry *)MYMALLOC(sizeof(struct stackEntry));
+       struct stackEntry *tmp=(struct stackEntry *)model_malloc(sizeof(struct stackEntry));
        tmp->next=stack;
        tmp->index=seqindex;
        tmp->snapshotid=takeSnapshot();