Author: Armin Rigo <[email protected]>
Branch: py3k-faulthandler
Changeset: r87443:cc3c09d40bf8
Date: 2016-09-29 12:13 +0200
http://bitbucket.org/pypy/pypy/changeset/cc3c09d40bf8/
Log: translation fixes
diff --git a/pypy/module/faulthandler/faulthandler.c
b/pypy/module/faulthandler/faulthandler.c
--- a/pypy/module/faulthandler/faulthandler.c
+++ b/pypy/module/faulthandler/faulthandler.c
@@ -139,7 +139,7 @@
}
#ifdef PYPY_FAULTHANDLER_LATER
-#include "src/thead.h"
+#include "src/thread.h"
static struct {
int fd;
long long microseconds;
@@ -199,7 +199,7 @@
if (thread_later.exit)
_exit(1);
- } while (thread.repeat);
+ } while (thread_later.repeat);
/* The only way out */
RPyThreadReleaseLock(&thread_later.running);
@@ -231,7 +231,7 @@
{
#ifdef PYPY_FAULTHANDLER_LATER
/* Notify cancellation */
- RRyThreadReleaseLock(&thread_later.cancel_event);
+ RPyThreadReleaseLock(&thread_later.cancel_event);
/* Wait for thread to join (or does nothing if no thread is running) */
RPyThreadAcquireLock(&thread_later.running, 1);
diff --git a/pypy/module/faulthandler/handler.py
b/pypy/module/faulthandler/handler.py
--- a/pypy/module/faulthandler/handler.py
+++ b/pypy/module/faulthandler/handler.py
@@ -77,6 +77,7 @@
keepalive_until_here(w_file)
def dump_traceback_later(self, timeout, repeat, w_file, exit):
+ space = self.space
timeout *= 1e6
try:
microseconds = ovfcheck_float_to_longlong(timeout)
diff --git a/rpython/translator/c/src/threadlocal.h
b/rpython/translator/c/src/threadlocal.h
--- a/rpython/translator/c/src/threadlocal.h
+++ b/rpython/translator/c/src/threadlocal.h
@@ -49,14 +49,14 @@
#define OP_THREADLOCALREF_ADDR(r) \
do { \
- r = (char *)&pypy_threadlocal; \
+ r = (void *)&pypy_threadlocal; \
if (pypy_threadlocal.ready != 42) \
r = _RPython_ThreadLocals_Build(); \
} while (0)
#define _OP_THREADLOCALREF_ADDR_SIGHANDLER(r) \
do { \
- r = (char *)&pypy_threadlocal; \
+ r = (void *)&pypy_threadlocal; \
if (pypy_threadlocal.ready != 42) \
r = NULL; \
} while (0)
@@ -92,14 +92,14 @@
#define OP_THREADLOCALREF_ADDR(r) \
do { \
- r = (char *)_RPy_ThreadLocals_Get(); \
+ r = (void *)_RPy_ThreadLocals_Get(); \
if (!r) \
r = _RPython_ThreadLocals_Build(); \
} while (0)
#define _OP_THREADLOCALREF_ADDR_SIGHANDLER(r) \
do { \
- r = (char *)_RPy_ThreadLocals_Get(); \
+ r = (void *)_RPy_ThreadLocals_Get(); \
} while (0)
#define RPY_THREADLOCALREF_ENSURE() \
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
