Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
bcfabad0
Commit
bcfabad0
authored
Jul 01, 2010
by
Alexey Kopytov
Browse files
Options
Browse Files
Download
Plain Diff
Automerge.
parents
095f7804
add8a66a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
11 deletions
+11
-11
include/my_alarm.h
include/my_alarm.h
+2
-2
include/my_global.h
include/my_global.h
+2
-2
libmysql/libmysql.c
libmysql/libmysql.c
+1
-1
mysys/thr_alarm.c
mysys/thr_alarm.c
+5
-5
sql/mysqld.cc
sql/mysqld.cc
+1
-1
No files found.
include/my_alarm.h
View file @
bcfabad0
...
...
@@ -36,14 +36,14 @@ extern ulong my_time_to_wait_for_lock;
#define ALARM_END (void) signal(SIGALRM,alarm_signal); \
(void) alarm(alarm_old);
#define ALARM_TEST my_have_got_alarm
#ifdef
DONT_REMEMBER_SIGNAL
#ifdef
SIGNAL_HANDLER_RESET_ON_DELIVERY
#define ALARM_REINIT (void) alarm(MY_HOW_OFTEN_TO_ALARM); \
(void) signal(SIGALRM,my_set_alarm_variable);\
my_have_got_alarm=0;
#else
#define ALARM_REINIT (void) alarm((uint) MY_HOW_OFTEN_TO_ALARM); \
my_have_got_alarm=0;
#endif
/*
DONT_REMEMBER_SIGNAL
*/
#endif
/*
SIGNAL_HANDLER_RESET_ON_DELIVERY
*/
#else
#define ALARM_VARIABLES long alarm_pos=0,alarm_end_pos=MY_HOW_OFTEN_TO_WRITE-1
#define ALARM_INIT
...
...
include/my_global.h
View file @
bcfabad0
...
...
@@ -627,8 +627,8 @@ extern "C" int madvise(void *addr, size_t len, int behav);
#endif
/* Does the system remember a signal handler after a signal ? */
#if
ndef HAVE_BSD_SIGNALS
#define
DONT_REMEMBER_SIGNAL
#if
!defined(HAVE_BSD_SIGNALS) && !defined(HAVE_SIGACTION)
#define
SIGNAL_HANDLER_RESET_ON_DELIVERY
#endif
#if defined(_lint) || defined(FORCE_INIT_OF_VARS)
...
...
libmysql/libmysql.c
View file @
bcfabad0
...
...
@@ -318,7 +318,7 @@ sig_handler
my_pipe_sig_handler
(
int
sig
__attribute__
((
unused
)))
{
DBUG_PRINT
(
"info"
,(
"Hit by signal %d"
,
sig
));
#ifdef
DONT_REMEMBER_SIGNAL
#ifdef
SIGNAL_HANDLER_RESET_ON_DELIVERY
(
void
)
signal
(
SIGPIPE
,
my_pipe_sig_handler
);
#endif
}
...
...
mysys/thr_alarm.c
View file @
bcfabad0
...
...
@@ -306,7 +306,7 @@ sig_handler process_alarm(int sig __attribute__((unused)))
#if defined(MAIN) && !defined(__bsdi__)
printf
(
"thread_alarm in process_alarm
\n
"
);
fflush
(
stdout
);
#endif
#ifdef
DONT_REMEMBER_SIGNAL
#ifdef
SIGNAL_HANDLER_RESET_ON_DELIVERY
my_sigset
(
thr_client_alarm
,
process_alarm
);
/* int. thread system calls */
#endif
return
;
...
...
@@ -325,7 +325,7 @@ sig_handler process_alarm(int sig __attribute__((unused)))
#endif
process_alarm_part2
(
sig
);
#ifndef USE_ALARM_THREAD
#if defined(
DONT_REMEMBER_SIGNAL
) && !defined(USE_ONE_SIGNAL_HAND)
#if defined(
SIGNAL_HANDLER_RESET_ON_DELIVERY
) && !defined(USE_ONE_SIGNAL_HAND)
my_sigset
(
THR_SERVER_ALARM
,
process_alarm
);
#endif
mysql_mutex_unlock
(
&
LOCK_alarm
);
...
...
@@ -523,12 +523,12 @@ void thr_alarm_info(ALARM_INFO *info)
*/
static
sig_handler
thread_alarm
(
int
sig
)
static
sig_handler
thread_alarm
(
int
sig
__attribute__
((
unused
))
)
{
#ifdef MAIN
printf
(
"thread_alarm
\n
"
);
fflush
(
stdout
);
#endif
#ifdef
DONT_REMEMBER_SIGNAL
#ifdef
SIGNAL_HANDLER_RESET_ON_DELIVERY
my_sigset
(
sig
,
thread_alarm
);
/* int. thread system calls */
#endif
}
...
...
@@ -797,7 +797,7 @@ static sig_handler print_signal_warning(int sig)
{
printf
(
"Warning: Got signal %d from thread %s
\n
"
,
sig
,
my_thread_name
());
fflush
(
stdout
);
#ifdef
DONT_REMEMBER_SIGNAL
#ifdef
SIGNAL_HANDLER_RESET_ON_DELIVERY
my_sigset
(
sig
,
print_signal_warning
);
/* int. thread system calls */
#endif
if
(
sig
==
SIGALRM
)
...
...
sql/mysqld.cc
View file @
bcfabad0
...
...
@@ -1388,7 +1388,7 @@ extern "C" sig_handler print_signal_warning(int sig)
{
if
(
global_system_variables
.
log_warnings
)
sql_print_warning
(
"Got signal %d from thread %ld"
,
sig
,
my_thread_id
());
#ifdef
DONT_REMEMBER_SIGNAL
#ifdef
SIGNAL_HANDLER_RESET_ON_DELIVERY
my_sigset
(
sig
,
print_signal_warning
);
/* int. thread system calls */
#endif
#if !defined(__WIN__) && !defined(__NETWARE__)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment