projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix snapshot code
[model-checker.git]
/
snapshot-interface.cc
diff --git
a/snapshot-interface.cc
b/snapshot-interface.cc
index 06dae19732e46d00b34865a4c8e9d9a9859f8704..5242d168fb4072552cda80f5069b85c3a29fd95b 100644
(file)
--- a/
snapshot-interface.cc
+++ b/
snapshot-interface.cc
@@
-2,21
+2,20
@@
#include <unistd.h>
#include <cstring>
#include <inttypes.h>
#include <unistd.h>
#include <cstring>
#include <inttypes.h>
-#include <vector>
#include "snapshot-interface.h"
#include "snapshot.h"
#include "common.h"
#include "mymemory.h"
#include "snapshot-interface.h"
#include "snapshot.h"
#include "common.h"
#include "mymemory.h"
+#include "stl-model.h"
/* MYBINARYNAME only works because our pathname usually includes 'model' (e.g.,
* /.../model-checker/test/userprog.o) */
#define MYBINARYNAME "model"
/* MYBINARYNAME only works because our pathname usually includes 'model' (e.g.,
* /.../model-checker/test/userprog.o) */
#define MYBINARYNAME "model"
-#define MYLIBRARYNAME "libmodel.so"
#define MAPFILE "/proc/self/maps"
#define MAPFILE "/proc/self/maps"
-struct s
tackE
ntry {
- s
tackE
ntry(snapshot_id id, int idx) : snapshotid(id), index(idx) { }
+struct s
napshot_e
ntry {
+ s
napshot_e
ntry(snapshot_id id, int idx) : snapshotid(id), index(idx) { }
snapshot_id snapshotid;
int index;
MEMALLOC
snapshot_id snapshotid;
int index;
MEMALLOC
@@
-24,17
+23,15
@@
struct stackEntry {
class SnapshotStack {
public:
class SnapshotStack {
public:
- SnapshotStack();
- ~SnapshotStack();
int backTrackBeforeStep(int seq_index);
void snapshotStep(int seq_index);
MEMALLOC
private:
int backTrackBeforeStep(int seq_index);
void snapshotStep(int seq_index);
MEMALLOC
private:
-
std::vector<struct stackEntry, ModelAlloc<struct stackEntry>
> stack;
+
ModelVector<struct snapshot_entry
> stack;
};
};
-static SnapshotStack *snap
shotObject
;
+static SnapshotStack *snap
_stack
;
#ifdef MAC
/** The SnapshotGlobalSegments function computes the memory regions
#ifdef MAC
/** The SnapshotGlobalSegments function computes the memory regions
@@
-67,16
+64,18
@@
static void SnapshotGlobalSegments()
char smstr[23];
char r, w, x;
char mr, mw, mx;
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;
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
);
+ sscanf(buf, "%22s %p-%p
", type, &begin, &end
);
- if (w == 'w' && (strstr(regionname, MYBINARYNAME) || strstr(regionname, MYLIBRARYNAME))) {
+ char * secondpart = strstr(buf, "]");
+
+ sscanf(&secondpart[2], "%c%c%c/%c%c%c SM=%3s %200s\n", &r, &w, &x, &mr, &mw, &mx, smstr, regionname);
+ if (w == 'w' && strstr(regionname, MYBINARYNAME)) {
size_t len = ((uintptr_t)end - (uintptr_t)begin) / PAGESIZE;
if (len != 0)
snapshot_add_memory_region(begin, len);
size_t len = ((uintptr_t)end - (uintptr_t)begin) / PAGESIZE;
if (len != 0)
snapshot_add_memory_region(begin, len);
@@
-88,10
+87,16
@@
static void SnapshotGlobalSegments()
static void get_binary_name(char *buf, size_t len)
{
static void get_binary_name(char *buf, size_t len)
{
- if (readlink("/proc/self/exe", buf, len) == -1) {
+ ssize_t size = readlink("/proc/self/exe", buf, len);
+ if (size < 0) {
perror("readlink");
exit(EXIT_FAILURE);
}
perror("readlink");
exit(EXIT_FAILURE);
}
+
+ /* Terminate string */
+ if ((size_t)size > len)
+ size = len;
+ buf[size] = '\0';
}
/** The SnapshotGlobalSegments function computes the memory regions
}
/** The SnapshotGlobalSegments function computes the memory regions
@@
-116,7
+121,7
@@
static void SnapshotGlobalSegments()
void *begin, *end;
sscanf(buf, "%p-%p %c%c%c%c %*x %*x:%*x %*u %200s\n", &begin, &end, &r, &w, &x, &p, regionname);
void *begin, *end;
sscanf(buf, "%p-%p %c%c%c%c %*x %*x:%*x %*u %200s\n", &begin, &end, &r, &w, &x, &p, regionname);
- if (w == 'w' &&
(strstr(regionname, binary_name) || strstr(regionname, MYLIBRARYNAME)
)) {
+ if (w == 'w' &&
strstr(regionname, binary_name
)) {
size_t len = ((uintptr_t)end - (uintptr_t)begin) / PAGESIZE;
if (len != 0)
snapshot_add_memory_region(begin, len);
size_t len = ((uintptr_t)end - (uintptr_t)begin) / PAGESIZE;
if (len != 0)
snapshot_add_memory_region(begin, len);
@@
-127,15
+132,6
@@
static void SnapshotGlobalSegments()
}
#endif
}
#endif
-SnapshotStack::SnapshotStack() : stack()
-{
- SnapshotGlobalSegments();
-}
-
-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.
/** 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.
@@
-159,20
+155,21
@@
int SnapshotStack::backTrackBeforeStep(int seqindex)
/** This method takes a snapshot at the given sequence number. */
void SnapshotStack::snapshotStep(int seqindex)
{
/** This method takes a snapshot at the given sequence number. */
void SnapshotStack::snapshotStep(int seqindex)
{
- stack.push_back(s
tackEntry(seqindex, take_snapshot()
));
+ stack.push_back(s
napshot_entry(take_snapshot(), seqindex
));
}
void snapshot_stack_init()
{
}
void snapshot_stack_init()
{
- snapshotObject = new SnapshotStack();
+ snap_stack = new SnapshotStack();
+ SnapshotGlobalSegments();
}
void snapshot_record(int seq_index)
{
}
void snapshot_record(int seq_index)
{
- snap
shotObject
->snapshotStep(seq_index);
+ snap
_stack
->snapshotStep(seq_index);
}
int snapshot_backtrack_before(int seq_index)
{
}
int snapshot_backtrack_before(int seq_index)
{
- return snap
shotObject
->backTrackBeforeStep(seq_index);
+ return snap
_stack
->backTrackBeforeStep(seq_index);
}
}