Author: Armin Rigo <[email protected]>
Branch:
Changeset: r363:007ac02eb935
Date: 2013-07-06 15:56 +0200
http://bitbucket.org/pypy/stmgc/changeset/007ac02eb935/
Log: Officialize stm_abort_and_retry()
diff --git a/c4/et.c b/c4/et.c
--- a/c4/et.c
+++ b/c4/et.c
@@ -756,6 +756,11 @@
smp_spinloop();
}
+void stm_abort_and_retry(void)
+{
+ AbortTransaction(ABRT_MANUAL);
+}
+
void AbortPrivateFromProtected(struct tx_descriptor *d);
void AbortTransaction(int num)
diff --git a/c4/stmgc.h b/c4/stmgc.h
--- a/c4/stmgc.h
+++ b/c4/stmgc.h
@@ -109,6 +109,7 @@
void stm_abort_info_pop(long count);
char *stm_inspect_abort_info(void);
+void stm_abort_and_retry(void);
/**************** END OF PUBLIC INTERFACE *****************/
diff --git a/c4/test/support.py b/c4/test/support.py
--- a/c4/test/support.py
+++ b/c4/test/support.py
@@ -68,6 +68,7 @@
void stm_abort_info_push(gcptr obj, long fieldoffsets[]);
void stm_abort_info_pop(long count);
char *stm_inspect_abort_info(void);
+ void stm_abort_and_retry(void);
/* extra non-public code */
void printfcolor(char *msg);
@@ -622,7 +623,7 @@
assert fine == [True]
def abort_and_retry():
- lib.AbortTransaction(lib.ABRT_MANUAL)
+ lib.stm_abort_and_retry()
def classify(p):
private_from_protected = (p.h_tid & GCFLAG_PRIVATE_FROM_PROTECTED) != 0
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
