#include <unistd.h>
#include <cstring>
#include <inttypes.h>
-#include <vector>
#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"
-#define MYLIBRARYNAME "libmodel.so"
#define MAPFILE "/proc/self/maps"
-struct stackEntry {
- stackEntry(snapshot_id id, int idx) : snapshotid(id), index(idx) { }
+struct snapshot_entry {
+ snapshot_entry(snapshot_id id, int idx) : snapshotid(id), index(idx) { }
snapshot_id snapshotid;
int index;
MEMALLOC
class SnapshotStack {
public:
- SnapshotStack();
- ~SnapshotStack();
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 *snapshotObject;
+static SnapshotStack *snap_stack;
#ifdef MAC
/** The SnapshotGlobalSegments function computes the memory regions
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))) {
+ 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);
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);
}
+
+ /* Terminate string */
+ if ((size_t)size > len)
+ size = len;
+ buf[size] = '\0';
}
/** The SnapshotGlobalSegments function computes the memory regions
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);
}
#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 takes a snapshot at the given sequence number. */
void SnapshotStack::snapshotStep(int seqindex)
{
- stack.push_back(stackEntry(seqindex, take_snapshot()));
+ stack.push_back(snapshot_entry(take_snapshot(), seqindex));
}
void snapshot_stack_init()
{
- snapshotObject = new SnapshotStack();
+ snap_stack = new SnapshotStack();
+ SnapshotGlobalSegments();
}
void snapshot_record(int seq_index)
{
- snapshotObject->snapshotStep(seq_index);
+ snap_stack->snapshotStep(seq_index);
}
int snapshot_backtrack_before(int seq_index)
{
- return snapshotObject->backTrackBeforeStep(seq_index);
+ return snap_stack->backTrackBeforeStep(seq_index);
}