Author: Remi Meier <[email protected]>
Branch:
Changeset: r1179:c79d45878460
Date: 2014-04-23 14:56 +0200
http://bitbucket.org/pypy/stmgc/changeset/c79d45878460/
Log: add function to hint another thread to commit soon. used in
contention.c to advise committing transactions that cause others to
abort.
diff --git a/c7/demo/demo2.c b/c7/demo/demo2.c
--- a/c7/demo/demo2.c
+++ b/c7/demo/demo2.c
@@ -44,6 +44,7 @@
visit((object_t **)&n->next);
}
+void stmcb_commit_soon() {}
nodeptr_t global_chained_list;
diff --git a/c7/demo/demo_largemalloc.c b/c7/demo/demo_largemalloc.c
--- a/c7/demo/demo_largemalloc.c
+++ b/c7/demo/demo_largemalloc.c
@@ -23,6 +23,8 @@
abort();
}
+void stmcb_commit_soon() {}
+
/************************************************************/
#define ARENA_SIZE (1024*1024*1024)
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
@@ -79,6 +79,8 @@
assert(n->next == *last_next);
}
+void stmcb_commit_soon() {}
+
int get_rand(int max)
{
if (max == 0)
diff --git a/c7/demo/demo_simple.c b/c7/demo/demo_simple.c
--- a/c7/demo/demo_simple.c
+++ b/c7/demo/demo_simple.c
@@ -39,6 +39,8 @@
visit((object_t **)&n->next);
}
+void stmcb_commit_soon() {}
+
static sem_t done;
diff --git a/c7/stm/contention.c b/c7/stm/contention.c
--- a/c7/stm/contention.c
+++ b/c7/stm/contention.c
@@ -164,7 +164,8 @@
change_timing_state(wait_category);
- /* XXX should also tell other_pseg "please commit soon" */
+ /* tell the other to commit ASAP */
+ signal_other_to_commit_soon(contmgr.other_pseg);
dprintf(("pausing...\n"));
cond_signal(C_AT_SAFE_POINT);
@@ -180,6 +181,9 @@
}
else if (!contmgr.abort_other) {
+ /* tell the other to commit ASAP, since it causes aborts */
+ signal_other_to_commit_soon(contmgr.other_pseg);
+
dprintf(("abort in contention\n"));
STM_SEGMENT->nursery_end = abort_category;
abort_with_mutex();
@@ -256,6 +260,10 @@
abort_data_structures_from_segment_num(other_segment_num);
}
dprintf(("killed other thread\n"));
+
+ /* we should commit soon, we caused an abort */
+
//signal_other_to_commit_soon(get_priv_segment(STM_SEGMENT->segment_num));
+ stmcb_commit_soon();
}
}
diff --git a/c7/stm/contention.h b/c7/stm/contention.h
--- a/c7/stm/contention.h
+++ b/c7/stm/contention.h
@@ -4,7 +4,8 @@
static void inevitable_contention_management(uint8_t other_segment_num);
static inline bool is_abort(uintptr_t nursery_end) {
- return (nursery_end <= _STM_NSE_SIGNAL_MAX && nursery_end != NSE_SIGPAUSE);
+ return (nursery_end <= _STM_NSE_SIGNAL_MAX && nursery_end != NSE_SIGPAUSE
+ && nursery_end != NSE_SIGCOMMITSOON);
}
static inline bool is_aborting_now(uint8_t other_segment_num) {
diff --git a/c7/stm/nursery.h b/c7/stm/nursery.h
--- a/c7/stm/nursery.h
+++ b/c7/stm/nursery.h
@@ -1,6 +1,7 @@
/* '_stm_nursery_section_end' is either NURSERY_END or NSE_SIGxxx */
#define NSE_SIGPAUSE STM_TIME_WAIT_OTHER
+#define NSE_SIGCOMMITSOON STM_TIME_SYNC_COMMIT_SOON
static uint32_t highest_overflow_number;
diff --git a/c7/stm/sync.c b/c7/stm/sync.c
--- a/c7/stm/sync.c
+++ b/c7/stm/sync.c
@@ -2,6 +2,10 @@
#include <sys/prctl.h>
#include <asm/prctl.h>
+#ifndef _STM_CORE_H_
+# error "must be compiled via stmgc.c"
+#endif
+
/* Each segment can be in one of three possible states, described by
the segment variable 'safe_point':
@@ -260,6 +264,16 @@
static bool _safe_points_requested = false;
#endif
+static void signal_other_to_commit_soon(struct stm_priv_segment_info_s
*other_pseg)
+{
+ assert(_has_mutex());
+ /* never overwrite abort signals or safepoint requests
+ (too messy to deal with) */
+ if (!is_abort(other_pseg->pub.nursery_end)
+ && !pause_signalled)
+ other_pseg->pub.nursery_end = NSE_SIGCOMMITSOON;
+}
+
static void signal_everybody_to_pause_running(void)
{
assert(_safe_points_requested == false);
@@ -323,7 +337,20 @@
if (STM_SEGMENT->nursery_end == NURSERY_END)
break; /* no safe point requested */
+ if (STM_SEGMENT->nursery_end == NSE_SIGCOMMITSOON) {
+ if (previous_state == -1) {
+ previous_state =
change_timing_state(STM_TIME_SYNC_COMMIT_SOON);
+ }
+
+ stmcb_commit_soon();
+ if (!pause_signalled) {
+ STM_SEGMENT->nursery_end = NURSERY_END;
+ break;
+ }
+ STM_SEGMENT->nursery_end = NSE_SIGPAUSE;
+ }
assert(STM_SEGMENT->nursery_end == NSE_SIGPAUSE);
+ assert(pause_signalled);
/* If we are requested to enter a safe-point, we cannot proceed now.
Wait until the safe-point request is removed for us. */
diff --git a/c7/stm/timing.c b/c7/stm/timing.c
--- a/c7/stm/timing.c
+++ b/c7/stm/timing.c
@@ -51,6 +51,7 @@
"wait write read",
"wait inevitable",
"wait other",
+ "sync commit soon",
"bookkeeping",
"minor gc",
"major gc",
diff --git a/c7/stmgc.h b/c7/stmgc.h
--- a/c7/stmgc.h
+++ b/c7/stmgc.h
@@ -66,6 +66,7 @@
STM_TIME_WAIT_WRITE_READ,
STM_TIME_WAIT_INEVITABLE,
STM_TIME_WAIT_OTHER,
+ STM_TIME_SYNC_COMMIT_SOON,
STM_TIME_BOOKKEEPING,
STM_TIME_MINOR_GC,
STM_TIME_MAJOR_GC,
@@ -209,9 +210,13 @@
The "size rounded up" must be a multiple of 8 and at least 16.
"Tracing" an object means enumerating all GC references in it,
by invoking the callback passed as argument.
+ stmcb_commit_soon() is called when it is advised to commit
+ the transaction as soon as possible in order to avoid conflicts
+ or improve performance in general.
*/
extern ssize_t stmcb_size_rounded_up(struct object_s *);
extern void stmcb_trace(struct object_s *, void (object_t **));
+extern void stmcb_commit_soon(void);
/* Allocate an object of the given size, which must be a multiple
diff --git a/c7/test/support.py b/c7/test/support.py
--- a/c7/test/support.py
+++ b/c7/test/support.py
@@ -272,6 +272,10 @@
}
}
+void stmcb_commit_soon()
+{
+}
+
''', sources=source_files,
define_macros=[('STM_TESTS', '1'),
('STM_LARGEMALLOC_TEST', '1'),
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
