Author: Armin Rigo <[email protected]>
Branch:
Changeset: r1285:e5fe5d362c60
Date: 2014-08-09 18:07 +0200
http://bitbucket.org/pypy/stmgc/changeset/e5fe5d362c60/
Log: Fix demo_random.c: there was indeed an issue with markers
diff --git a/c7/demo/demo_random.c b/c7/demo/demo_random.c
--- a/c7/demo/demo_random.c
+++ b/c7/demo/demo_random.c
@@ -81,6 +81,15 @@
void stmcb_commit_soon() {}
+void stmcb_trace_cards(struct object_s *obj, void cb(object_t **),
+ uintptr_t start, uintptr_t stop) {
+ abort();
+}
+void stmcb_get_card_base_itemsize(struct object_s *obj,
+ uintptr_t offset_itemsize[2]) {
+ abort();
+}
+
int get_rand(int max)
{
if (max == 0)
diff --git a/c7/stm/forksupport.c b/c7/stm/forksupport.c
--- a/c7/stm/forksupport.c
+++ b/c7/stm/forksupport.c
@@ -189,6 +189,7 @@
#endif
pr->pub.running_thread->shadowstack = (
pr->shadowstack_at_start_of_transaction);
+ strcpy(pr->marker_self, "fork");
stm_abort_transaction();
}
}
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
