Author: Armin Rigo <[email protected]>
Branch:
Changeset: r79019:bbcfcccf2f68
Date: 2015-08-17 16:59 +0200
http://bitbucket.org/pypy/pypy/changeset/bbcfcccf2f68/
Log: Rename files and functions to split some parts from RPython
diff --git a/rpython/rlib/rvmprof/cintf.py b/rpython/rlib/rvmprof/cintf.py
--- a/rpython/rlib/rvmprof/cintf.py
+++ b/rpython/rlib/rvmprof/cintf.py
@@ -40,24 +40,18 @@
**eci_kwds))
- vmprof_init = rffi.llexternal("rpython_vmprof_init", [rffi.INT],
rffi.CCHARP,
+ vmprof_init = rffi.llexternal("vmprof_init", [rffi.INT], rffi.CCHARP,
compilation_info=eci)
- vmprof_enable = rffi.llexternal("rpython_vmprof_enable", [rffi.LONG],
rffi.INT,
+ vmprof_enable = rffi.llexternal("vmprof_enable", [rffi.LONG], rffi.INT,
compilation_info=eci,
save_err=rffi.RFFI_SAVE_ERRNO)
- vmprof_disable = rffi.llexternal("rpython_vmprof_disable", [], rffi.INT,
+ vmprof_disable = rffi.llexternal("vmprof_disable", [], rffi.INT,
compilation_info=eci,
save_err=rffi.RFFI_SAVE_ERRNO)
- vmprof_write_buf = rffi.llexternal("rpython_vmprof_write_buf",
+ vmprof_write_buf = rffi.llexternal("vmprof_write_buf",
[rffi.CCHARP, rffi.LONG],
lltype.Void, compilation_info=eci)
-
- ## vmprof_register_virtual_function = rffi.llexternal(
- ## "vmprof_register_virtual_function",
- ## [rffi.CCHARP, rffi.VOIDP, rffi.VOIDP], lltype.Void,
- ## compilation_info=eci, _nowrapper=True)
-
- vmprof_ignore_signals = rffi.llexternal("rpython_vmprof_ignore_signals",
+ vmprof_ignore_signals = rffi.llexternal("vmprof_ignore_signals",
[rffi.INT], lltype.Void,
compilation_info=eci)
return CInterface(locals())
diff --git a/rpython/rlib/rvmprof/src/rvmprof.c
b/rpython/rlib/rvmprof/src/rvmprof.c
--- a/rpython/rlib/rvmprof/src/rvmprof.c
+++ b/rpython/rlib/rvmprof/src/rvmprof.c
@@ -1,22 +1,3 @@
-/* VMPROF
- *
- * statistical sampling profiler specifically designed to profile programs
- * which run on a Virtual Machine and/or bytecode interpreter, such as Python,
- * etc.
- *
- * The logic to dump the C stack traces is partly stolen from the code in
- * gperftools.
- * The file "getpc.h" has been entirely copied from gperftools.
- *
- * Tested only on gcc, linux, x86_64.
- *
- * Copyright (C) 2014-2015
- * Antonio Cuni - [email protected]
- * Maciej Fijalkowski - [email protected]
- * Armin Rigo - [email protected]
- *
- */
-
#define _GNU_SOURCE 1
@@ -39,431 +20,4 @@
#endif
-#include <dlfcn.h>
-#include <assert.h>
-#include <pthread.h>
-#include <sys/time.h>
-#include <errno.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include "rvmprof_getpc.h"
-#include "rvmprof_unwind.h"
-#include "rvmprof_mt.h"
-
-
-/************************************************************/
-
-// functions copied from libunwind using dlopen
-
-static int (*unw_get_reg)(unw_cursor_t*, int, unw_word_t*) = NULL;
-static int (*unw_step)(unw_cursor_t*) = NULL;
-static int (*unw_init_local)(unw_cursor_t *, unw_context_t *) = NULL;
-static int (*unw_get_proc_info)(unw_cursor_t *, unw_proc_info_t *) = NULL;
-
-static int profile_file = -1;
-
-
-RPY_EXTERN
-char *rpython_vmprof_init(int fd)
-{
- if (!unw_get_reg) {
- void *libhandle;
-
- if (!(libhandle = dlopen("libunwind.so", RTLD_LAZY | RTLD_LOCAL)))
- goto error;
- if (!(unw_get_reg = dlsym(libhandle, "_ULx86_64_get_reg")))
- goto error;
- if (!(unw_get_proc_info = dlsym(libhandle, "_ULx86_64_get_proc_info")))
- goto error;
- if (!(unw_init_local = dlsym(libhandle, "_ULx86_64_init_local")))
- goto error;
- if (!(unw_step = dlsym(libhandle, "_ULx86_64_step")))
- goto error;
- }
- if (prepare_concurrent_bufs() < 0)
- return "out of memory";
-
- assert(fd >= 0);
- profile_file = fd;
- return NULL;
-
- error:
- return dlerror();
-}
-
-/************************************************************/
-
-/* value: last bit is 1 if signals must be ignored; all other bits
- are a counter for how many threads are currently in a signal handler */
-static long volatile signal_handler_value = 1;
-
-RPY_EXTERN
-void rpython_vmprof_ignore_signals(int ignored)
-{
- if (!ignored) {
- __sync_fetch_and_and(&signal_handler_value, ~1L);
- }
- else {
- /* set the last bit, and wait until concurrently-running signal
- handlers finish */
- while (__sync_or_and_fetch(&signal_handler_value, 1L) != 1L) {
- usleep(1);
- }
- }
-}
-
-
-/* *************************************************************
- * functions to write a profile file compatible with gperftools
- * *************************************************************
- */
-
-#define MAX_FUNC_NAME 128
-#define MAX_STACK_DEPTH \
- ((SINGLE_BUF_SIZE - sizeof(struct prof_stacktrace_s)) / sizeof(void *))
-
-#define MARKER_STACKTRACE '\x01'
-#define MARKER_VIRTUAL_IP '\x02'
-#define MARKER_TRAILER '\x03'
-
-struct prof_stacktrace_s {
- char padding[sizeof(long) - 1];
- char marker;
- long count, depth;
- void *stack[];
-};
-
-static long profile_interval_usec = 0;
-static char atfork_hook_installed = 0;
-
-
-/* ******************************************************
- * libunwind workaround for process JIT frames correctly
- * ******************************************************
- */
-
-#include "rvmprof_get_custom_offset.h"
-
-typedef struct {
- void* _unused1;
- void* _unused2;
- void* sp;
- void* ip;
- void* _unused3[sizeof(unw_cursor_t)/sizeof(void*) - 4];
-} vmprof_hacked_unw_cursor_t;
-
-static int vmprof_unw_step(unw_cursor_t *cp, int first_run)
-{
- void* ip;
- void* sp;
- ptrdiff_t sp_offset;
- unw_get_reg (cp, UNW_REG_IP, (unw_word_t*)&ip);
- unw_get_reg (cp, UNW_REG_SP, (unw_word_t*)&sp);
- if (!first_run) {
- // make sure we're pointing to the CALL and not to the first
- // instruction after. If the callee adjusts the stack for us
- // it's not safe to be at the instruction after
- ip -= 1;
- }
- sp_offset = vmprof_unw_get_custom_offset(ip, cp);
-
- if (sp_offset == -1) {
- // it means that the ip is NOT in JITted code, so we can use the
- // stardard unw_step
- return unw_step(cp);
- }
- else {
- // this is a horrible hack to manually walk the stack frame, by
- // setting the IP and SP in the cursor
- vmprof_hacked_unw_cursor_t *cp2 = (vmprof_hacked_unw_cursor_t*)cp;
- void* bp = (void*)sp + sp_offset;
- cp2->sp = bp;
- bp -= sizeof(void*);
- cp2->ip = ((void**)bp)[0];
- // the ret is on the top of the stack minus WORD
- return 1;
- }
-}
-
-
-/* *************************************************************
- * functions to dump the stack trace
- * *************************************************************
- */
-
-static int get_stack_trace(void** result, int max_depth, ucontext_t *ucontext)
-{
- void *ip;
- int n = 0;
- unw_cursor_t cursor;
- unw_context_t uc = *ucontext;
-
- int ret = unw_init_local(&cursor, &uc);
- assert(ret >= 0);
- (void)ret;
-
- while (n < max_depth) {
- if (unw_get_reg(&cursor, UNW_REG_IP, (unw_word_t *) &ip) < 0) {
- break;
- }
-
- unw_proc_info_t pip;
- unw_get_proc_info(&cursor, &pip);
-
- /* if n==0, it means that the signal handler interrupted us while we
- were in the trampoline, so we are not executing (yet) the real main
- loop function; just skip it */
- if (VMPROF_ADDR_OF_TRAMPOLINE((void*)pip.start_ip) && n > 0) {
- // found main loop stack frame
- void* sp;
- unw_get_reg(&cursor, UNW_REG_SP, (unw_word_t *) &sp);
- void *arg_addr = (char*)sp /* + mainloop_sp_offset */;
- void **arg_ptr = (void**)arg_addr;
- /* if (mainloop_get_virtual_ip) {
- ip = mainloop_get_virtual_ip(*arg_ptr);
- } else { */
- ip = *arg_ptr;
- }
-
- int first_run = (n == 0);
- result[n++] = ip;
- n = vmprof_write_header_for_jit_addr(result, n, ip, max_depth);
- if (vmprof_unw_step(&cursor, first_run) <= 0)
- break;
- }
- return n;
-}
-
-
-/* *************************************************************
- * the signal handler
- * *************************************************************
- */
-
-static void sigprof_handler(int sig_nr, siginfo_t* info, void *ucontext)
-{
- long val = __sync_fetch_and_add(&signal_handler_value, 2L);
-
- if ((val & 1) == 0) {
- int saved_errno = errno;
- int fd = profile_file;
- assert(fd >= 0);
-
- struct profbuf_s *p = reserve_buffer(fd);
- if (p == NULL) {
- /* ignore this signal: there are no free buffers right now */
- }
- else {
- int depth;
- struct prof_stacktrace_s *st = (struct prof_stacktrace_s *)p->data;
- st->marker = MARKER_STACKTRACE;
- st->count = 1;
- st->stack[0] = GetPC((ucontext_t*)ucontext);
- depth = get_stack_trace(st->stack+1, MAX_STACK_DEPTH-1, ucontext);
- depth++; // To account for pc value in stack[0];
- st->depth = depth;
- p->data_offset = offsetof(struct prof_stacktrace_s, marker);
- p->data_size = (depth * sizeof(void *) +
- sizeof(struct prof_stacktrace_s) -
- offsetof(struct prof_stacktrace_s, marker));
- commit_buffer(fd, p);
- }
-
- errno = saved_errno;
- }
-
- __sync_sub_and_fetch(&signal_handler_value, 2L);
-}
-
-
-/* *************************************************************
- * the setup and teardown functions
- * *************************************************************
- */
-
-static int install_sigprof_handler(void)
-{
- struct sigaction sa;
- memset(&sa, 0, sizeof(sa));
- sa.sa_sigaction = sigprof_handler;
- sa.sa_flags = SA_RESTART | SA_SIGINFO;
- if (sigemptyset(&sa.sa_mask) == -1 ||
- sigaction(SIGPROF, &sa, NULL) == -1)
- return -1;
- return 0;
-}
-
-static int remove_sigprof_handler(void)
-{
- if (signal(SIGPROF, SIG_DFL) == SIG_ERR)
- return -1;
- return 0;
-}
-
-static int install_sigprof_timer(void)
-{
- static struct itimerval timer;
- timer.it_interval.tv_sec = 0;
- timer.it_interval.tv_usec = profile_interval_usec;
- timer.it_value = timer.it_interval;
- if (setitimer(ITIMER_PROF, &timer, NULL) != 0)
- return -1;
- return 0;
-}
-
-static int remove_sigprof_timer(void) {
- static struct itimerval timer;
- timer.it_interval.tv_sec = 0;
- timer.it_interval.tv_usec = 0;
- timer.it_value.tv_sec = 0;
- timer.it_value.tv_usec = 0;
- if (setitimer(ITIMER_PROF, &timer, NULL) != 0)
- return -1;
- return 0;
-}
-
-static void atfork_disable_timer(void) {
- if (profile_interval_usec > 0) {
- remove_sigprof_timer();
- }
-}
-
-static void atfork_enable_timer(void) {
- if (profile_interval_usec > 0) {
- install_sigprof_timer();
- }
-}
-
-static int install_pthread_atfork_hooks(void) {
- /* this is needed to prevent the problems described there:
- - http://code.google.com/p/gperftools/issues/detail?id=278
- - http://lists.debian.org/debian-glibc/2010/03/msg00161.html
-
- TL;DR: if the RSS of the process is large enough, the clone() syscall
- will be interrupted by the SIGPROF before it can complete, then
- retried, interrupted again and so on, in an endless loop. The
- solution is to disable the timer around the fork, and re-enable it
- only inside the parent.
- */
- if (atfork_hook_installed)
- return 0;
- int ret = pthread_atfork(atfork_disable_timer, atfork_enable_timer, NULL);
- if (ret != 0)
- return -1;
- atfork_hook_installed = 1;
- return 0;
-}
-
-RPY_EXTERN
-int rpython_vmprof_enable(long interval_usec)
-{
- assert(profile_file >= 0);
- assert(interval_usec > 0);
- profile_interval_usec = interval_usec;
-
- if (install_pthread_atfork_hooks() == -1)
- goto error;
- if (install_sigprof_handler() == -1)
- goto error;
- if (install_sigprof_timer() == -1)
- goto error;
- rpython_vmprof_ignore_signals(0);
- return 0;
-
- error:
- profile_file = -1;
- profile_interval_usec = 0;
- return -1;
-}
-
-static int _write_all(const void *buf, size_t bufsize)
-{
- while (bufsize > 0) {
- ssize_t count = write(profile_file, buf, bufsize);
- if (count <= 0)
- return -1; /* failed */
- buf += count;
- bufsize -= count;
- }
- return 0;
-}
-
-static int close_profile(void)
-{
- char buf[4096];
- ssize_t size;
- unsigned char marker = MARKER_TRAILER;
-
- if (_write_all(&marker, 1) < 0)
- return -1;
-
-#ifdef __linux__
- // copy /proc/self/maps to the end of the profile file
- int srcfd = open("/proc/self/maps", O_RDONLY);
- if (srcfd < 0)
- return -1;
-
- while ((size = read(srcfd, buf, sizeof buf)) > 0) {
- if (_write_all(buf, size) < 0) {
- close(srcfd);
- return -1;
- }
- }
- close(srcfd);
-#else
- // freebsd and mac
- sprintf(buf, "procstat -v %d", getpid());
- FILE *srcf = popen(buf, "r");
- if (!srcf)
- return -1;
-
- while ((size = fread(buf, 1, sizeof buf, src))) {
- if (_write_all(buf, size) < 0) {
- pclose(srcf);
- return -1;
- }
- }
- pclose(srcf);
-#endif
-
- /* don't close() the file descriptor from here */
- profile_file = -1;
- return 0;
-}
-
-RPY_EXTERN
-int rpython_vmprof_disable(void)
-{
- rpython_vmprof_ignore_signals(1);
- profile_interval_usec = 0;
-
- if (remove_sigprof_timer() == -1)
- return -1;
- if (remove_sigprof_handler() == -1)
- return -1;
- if (shutdown_concurrent_bufs(profile_file) < 0)
- return -1;
- return close_profile();
-}
-
-RPY_EXTERN
-void rpython_vmprof_write_buf(char *buf, long size)
-{
- struct profbuf_s *p;
-
- while ((p = reserve_buffer(profile_file)) == NULL) {
- /* spin loop waiting for a buffer to be ready; should almost never
- be the case */
- usleep(1);
- }
-
- if (size > SINGLE_BUF_SIZE)
- size = SINGLE_BUF_SIZE;
- memcpy(p->data, buf, size);
- p->data_size = size;
-
- commit_buffer(profile_file, p);
-}
+#include "vmprof_main.h"
diff --git a/rpython/rlib/rvmprof/src/rvmprof.h
b/rpython/rlib/rvmprof/src/rvmprof.h
--- a/rpython/rlib/rvmprof/src/rvmprof.h
+++ b/rpython/rlib/rvmprof/src/rvmprof.h
@@ -1,6 +1,6 @@
-RPY_EXTERN char *rpython_vmprof_init(int);
-RPY_EXTERN void rpython_vmprof_ignore_signals(int);
-RPY_EXTERN int rpython_vmprof_enable(long);
-RPY_EXTERN int rpython_vmprof_disable(void);
-RPY_EXTERN void rpython_vmprof_write_buf(char *, long);
+RPY_EXTERN char *vmprof_init(int);
+RPY_EXTERN void vmprof_ignore_signals(int);
+RPY_EXTERN int vmprof_enable(long);
+RPY_EXTERN int vmprof_disable(void);
+RPY_EXTERN void vmprof_write_buf(char *, long);
diff --git a/rpython/rlib/rvmprof/src/rvmprof_config.h
b/rpython/rlib/rvmprof/src/vmprof_config.h
rename from rpython/rlib/rvmprof/src/rvmprof_config.h
rename to rpython/rlib/rvmprof/src/vmprof_config.h
diff --git a/rpython/rlib/rvmprof/src/rvmprof_get_custom_offset.h
b/rpython/rlib/rvmprof/src/vmprof_get_custom_offset.h
rename from rpython/rlib/rvmprof/src/rvmprof_get_custom_offset.h
rename to rpython/rlib/rvmprof/src/vmprof_get_custom_offset.h
diff --git a/rpython/rlib/rvmprof/src/rvmprof_getpc.h
b/rpython/rlib/rvmprof/src/vmprof_getpc.h
rename from rpython/rlib/rvmprof/src/rvmprof_getpc.h
rename to rpython/rlib/rvmprof/src/vmprof_getpc.h
--- a/rpython/rlib/rvmprof/src/rvmprof_getpc.h
+++ b/rpython/rlib/rvmprof/src/vmprof_getpc.h
@@ -44,7 +44,7 @@
#ifndef BASE_GETPC_H_
#define BASE_GETPC_H_
-#include "rvmprof_config.h"
+#include "vmprof_config.h"
// On many linux systems, we may need _GNU_SOURCE to get access to
// the defined constants that define the register we want to see (eg
diff --git a/rpython/rlib/rvmprof/src/rvmprof.c
b/rpython/rlib/rvmprof/src/vmprof_main.h
copy from rpython/rlib/rvmprof/src/rvmprof.c
copy to rpython/rlib/rvmprof/src/vmprof_main.h
--- a/rpython/rlib/rvmprof/src/rvmprof.c
+++ b/rpython/rlib/rvmprof/src/vmprof_main.h
@@ -19,26 +19,6 @@
#define _GNU_SOURCE 1
-
-#ifdef RPYTHON_LL2CTYPES
- /* only for testing: ll2ctypes sets RPY_EXTERN from the command-line */
-# ifndef RPY_EXTERN
-# define RPY_EXTERN RPY_EXPORTED
-# endif
-# define RPY_EXPORTED extern __attribute__((visibility("default")))
-# define VMPROF_ADDR_OF_TRAMPOLINE(addr) 0
-
-#else
-
-# include "common_header.h"
-# include "rvmprof.h"
-# ifndef VMPROF_ADDR_OF_TRAMPOLINE
-# error "RPython program using rvmprof, but not calling
vmprof_execute_code()"
-# endif
-
-#endif
-
-
#include <dlfcn.h>
#include <assert.h>
#include <pthread.h>
@@ -49,9 +29,9 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-#include "rvmprof_getpc.h"
-#include "rvmprof_unwind.h"
-#include "rvmprof_mt.h"
+#include "vmprof_getpc.h"
+#include "vmprof_unwind.h"
+#include "vmprof_mt.h"
/************************************************************/
@@ -67,7 +47,7 @@
RPY_EXTERN
-char *rpython_vmprof_init(int fd)
+char *vmprof_init(int fd)
{
if (!unw_get_reg) {
void *libhandle;
@@ -101,7 +81,7 @@
static long volatile signal_handler_value = 1;
RPY_EXTERN
-void rpython_vmprof_ignore_signals(int ignored)
+void vmprof_ignore_signals(int ignored)
{
if (!ignored) {
__sync_fetch_and_and(&signal_handler_value, ~1L);
@@ -145,7 +125,7 @@
* ******************************************************
*/
-#include "rvmprof_get_custom_offset.h"
+#include "vmprof_get_custom_offset.h"
typedef struct {
void* _unused1;
@@ -358,7 +338,7 @@
}
RPY_EXTERN
-int rpython_vmprof_enable(long interval_usec)
+int vmprof_enable(long interval_usec)
{
assert(profile_file >= 0);
assert(interval_usec > 0);
@@ -370,7 +350,7 @@
goto error;
if (install_sigprof_timer() == -1)
goto error;
- rpython_vmprof_ignore_signals(0);
+ vmprof_ignore_signals(0);
return 0;
error:
@@ -435,9 +415,9 @@
}
RPY_EXTERN
-int rpython_vmprof_disable(void)
+int vmprof_disable(void)
{
- rpython_vmprof_ignore_signals(1);
+ vmprof_ignore_signals(1);
profile_interval_usec = 0;
if (remove_sigprof_timer() == -1)
@@ -450,7 +430,7 @@
}
RPY_EXTERN
-void rpython_vmprof_write_buf(char *buf, long size)
+void vmprof_write_buf(char *buf, long size)
{
struct profbuf_s *p;
diff --git a/rpython/rlib/rvmprof/src/rvmprof_mt.h
b/rpython/rlib/rvmprof/src/vmprof_mt.h
rename from rpython/rlib/rvmprof/src/rvmprof_mt.h
rename to rpython/rlib/rvmprof/src/vmprof_mt.h
--- a/rpython/rlib/rvmprof/src/rvmprof_mt.h
+++ b/rpython/rlib/rvmprof/src/vmprof_mt.h
@@ -193,7 +193,7 @@
static int shutdown_concurrent_bufs(int fd)
{
/* no signal handler can be running concurrently here, because we
- already did rpython_vmprof_ignore_signals(1) */
+ already did vmprof_ignore_signals(1) */
assert(profbuf_write_lock == 0);
profbuf_write_lock = 2;
diff --git a/rpython/rlib/rvmprof/src/rvmprof_unwind.h
b/rpython/rlib/rvmprof/src/vmprof_unwind.h
rename from rpython/rlib/rvmprof/src/rvmprof_unwind.h
rename to rpython/rlib/rvmprof/src/vmprof_unwind.h
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
