aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTomohiro Matsuyama2012-09-27 08:14:13 +0900
committerTomohiro Matsuyama2012-09-27 08:14:13 +0900
commit3670daf7f9a480d8e87b292ff7051d5be331c6b4 (patch)
tree7c4d307f2e0d8575ea4244bc4580a4e89147f885 /src
parent41e9b956afd3eed1c9a8385b474a83697bd75dbb (diff)
downloademacs-3670daf7f9a480d8e87b292ff7051d5be331c6b4.tar.gz
emacs-3670daf7f9a480d8e87b292ff7051d5be331c6b4.zip
* profiler.c (Fprofiler_cpu_start): Remove unnecessary flag SA_SIGINFO.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/profiler.c6
2 files changed, 7 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 7a5192ad6bf..445090fb2a1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12012-09-26 Tomohiro Matsuyama <tomo@cx4a.org>
2
3 * profiler.c (Fprofiler_cpu_start): Remove unnecessary flag SA_SIGINFO.
4
12012-09-26 Juanma Barranquero <lekktu@gmail.com> 52012-09-26 Juanma Barranquero <lekktu@gmail.com>
2 6
3 * makefile.w32-in ($(BLD)/profiler.$(O)): Update dependencies. 7 * makefile.w32-in ($(BLD)/profiler.$(O)): Update dependencies.
diff --git a/src/profiler.c b/src/profiler.c
index f8fa697d79d..877a42cc98e 100644
--- a/src/profiler.c
+++ b/src/profiler.c
@@ -214,7 +214,7 @@ static int current_sample_interval;
214/* Signal handler for sample profiler. */ 214/* Signal handler for sample profiler. */
215 215
216static void 216static void
217sigprof_handler (int signal, siginfo_t *info, void *ctx) 217sigprof_handler (int signal)
218{ 218{
219 eassert (HASH_TABLE_P (cpu_log)); 219 eassert (HASH_TABLE_P (cpu_log));
220 if (backtrace_list && EQ (*backtrace_list->function, Qautomatic_gc)) 220 if (backtrace_list && EQ (*backtrace_list->function, Qautomatic_gc))
@@ -251,8 +251,8 @@ See also `profiler-log-size' and `profiler-max-stack-depth'. */)
251 251
252 current_sample_interval = XINT (sample_interval); 252 current_sample_interval = XINT (sample_interval);
253 253
254 sa.sa_sigaction = sigprof_handler; 254 sa.sa_handler = sigprof_handler;
255 sa.sa_flags = SA_RESTART | SA_SIGINFO; 255 sa.sa_flags = SA_RESTART;
256 sigemptyset (&sa.sa_mask); 256 sigemptyset (&sa.sa_mask);
257 sigaction (SIGPROF, &sa, 0); 257 sigaction (SIGPROF, &sa, 0);
258 258