projects
/
c11tester.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
improve efficiency of selectWrite
[c11tester.git]
/
snapshot-interface.cc
diff --git
a/snapshot-interface.cc
b/snapshot-interface.cc
index bd1de3e60645f15e299e545b07d197b5c90d4e43..bf12fe8ae77f60471327b8cd9ccc41a4521acb9a 100644
(file)
--- a/
snapshot-interface.cc
+++ b/
snapshot-interface.cc
@@
-12,7
+12,6
@@
/* 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"
struct snapshot_entry {
#define MAPFILE "/proc/self/maps"
struct snapshot_entry {
@@
-23,12
+22,12
@@
struct snapshot_entry {
};
class SnapshotStack {
};
class SnapshotStack {
-
public:
+public:
int backTrackBeforeStep(int seq_index);
void snapshotStep(int seq_index);
MEMALLOC
int backTrackBeforeStep(int seq_index);
void snapshotStep(int seq_index);
MEMALLOC
-
private:
+private:
ModelVector<struct snapshot_entry> stack;
};
ModelVector<struct snapshot_entry> stack;
};
@@
-65,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);
@@
-86,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
@@
-114,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);
@@
-134,7
+141,7
@@
static void SnapshotGlobalSegments()
int SnapshotStack::backTrackBeforeStep(int seqindex)
{
int i;
int SnapshotStack::backTrackBeforeStep(int seqindex)
{
int i;
- for (i = (int)stack.size() - 1;
i >= 0;
i++)
+ for (i = (int)stack.size() - 1;
i >= 0;
i++)
if (stack[i].index <= seqindex)
break;
else
if (stack[i].index <= seqindex)
break;
else