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
a811fd23
Commit
a811fd23
authored
Dec 18, 2006
by
msvensson@shellback
Browse files
Options
Browse Files
Download
Plain Diff
Merge maint1:/data/localhome/msvensson/mysql-5.1-new-maint
into shellback.:C:/mysql/mysql-5.1-new-maint
parents
777debdc
395a0167
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
29 additions
and
38 deletions
+29
-38
sql/event_queue.cc
sql/event_queue.cc
+29
-38
No files found.
sql/event_queue.cc
View file @
a811fd23
...
@@ -699,10 +699,7 @@ static const char *queue_wait_msg= "Waiting for next activation";
...
@@ -699,10 +699,7 @@ static const char *queue_wait_msg= "Waiting for next activation";
RETURN VALUE
RETURN VALUE
FALSE No error. If *job_data==NULL then top not elligible for execution.
FALSE No error. If *job_data==NULL then top not elligible for execution.
Could be that there is no top. If abstime->tv_sec is set to value
Could be that there is no top.
greater than zero then use abstime with pthread_cond_timedwait().
If abstime->tv_sec is zero then sleep with pthread_cond_wait().
abstime->tv_nsec is always zero.
TRUE Error
TRUE Error
*/
*/
...
@@ -712,7 +709,6 @@ Event_queue::get_top_for_execution_if_time(THD *thd, Event_job_data **job_data)
...
@@ -712,7 +709,6 @@ Event_queue::get_top_for_execution_if_time(THD *thd, Event_job_data **job_data)
{
{
bool
ret
=
FALSE
;
bool
ret
=
FALSE
;
struct
timespec
top_time
;
struct
timespec
top_time
;
struct
timespec
*
abstime
;
Event_queue_element
*
top
=
NULL
;
Event_queue_element
*
top
=
NULL
;
bool
to_free
=
FALSE
;
bool
to_free
=
FALSE
;
bool
to_drop
=
FALSE
;
bool
to_drop
=
FALSE
;
...
@@ -724,44 +720,40 @@ Event_queue::get_top_for_execution_if_time(THD *thd, Event_job_data **job_data)
...
@@ -724,44 +720,40 @@ Event_queue::get_top_for_execution_if_time(THD *thd, Event_job_data **job_data)
{
{
int
res
;
int
res
;
thd
->
end_time
();
/* Break loop if thd has been killed */
time_t
now
=
thd
->
query_start
();
if
(
thd
->
killed
)
abstime
=
NULL
;
if
(
queue
.
elements
)
{
{
top
=
((
Event_queue_element
*
)
queue_element
(
&
queue
,
0
));
DBUG_PRINT
(
"info"
,
(
"thd->killed=%d"
,
thd
->
killed
));
set_timespec
(
top_time
,
goto
end
;
sec_since_epoch_TIME
(
&
top
->
execute_at
)
-
now
);
abstime
=
&
top_time
;
}
}
if
(
!
abstime
||
get_timespec_sec
(
*
abstime
)
>
now
)
if
(
!
queue
.
elements
)
{
const
char
*
msg
;
if
(
abstime
)
{
next_activation_at
=
top
->
execute_at
;
msg
=
queue_wait_msg
;
}
else
{
{
/* There are no events in the queue */
set_zero_time
(
&
next_activation_at
,
MYSQL_TIMESTAMP_DATETIME
);
set_zero_time
(
&
next_activation_at
,
MYSQL_TIMESTAMP_DATETIME
);
msg
=
queue_empty_msg
;
/* Wait on condition until signaled. Release LOCK_queue while waiting. */
cond_wait
(
thd
,
NULL
,
queue_empty_msg
,
SCHED_FUNC
,
__LINE__
);
continue
;
}
}
cond_wait
(
thd
,
abstime
,
msg
,
SCHED_FUNC
,
__LINE__
);
top
=
((
Event_queue_element
*
)
queue_element
(
&
queue
,
0
));
if
(
thd
->
killed
)
thd
->
end_time
();
/* Get current time */
time_t
seconds_to_next_event
=
sec_since_epoch_TIME
(
&
top
->
execute_at
)
-
thd
->
query_start
();
next_activation_at
=
top
->
execute_at
;
if
(
seconds_to_next_event
>
0
)
{
{
DBUG_PRINT
(
"info"
,
(
"thd->killed=%d"
,
thd
->
killed
));
goto
end
;
}
/*
/*
The queue could have been emptied. Therefore it's safe to start from
Not yet time for top event, wait on condition with
the beginning. Moreover, this way we will get also the new top, if
time or until signaled. Release LOCK_queue while waiting.
the element at the top has been changed.
*/
*/
set_timespec
(
top_time
,
seconds_to_next_event
);
cond_wait
(
thd
,
&
top_time
,
queue_wait_msg
,
SCHED_FUNC
,
__LINE__
);
continue
;
continue
;
}
}
...
@@ -803,7 +795,7 @@ Event_queue::get_top_for_execution_if_time(THD *thd, Event_job_data **job_data)
...
@@ -803,7 +795,7 @@ Event_queue::get_top_for_execution_if_time(THD *thd, Event_job_data **job_data)
else
else
queue_replaced
(
&
queue
);
queue_replaced
(
&
queue
);
dbug_dump_queue
(
now
);
dbug_dump_queue
(
thd
->
query_start
()
);
break
;
break
;
}
}
end:
end:
...
@@ -816,8 +808,7 @@ Event_queue::get_top_for_execution_if_time(THD *thd, Event_job_data **job_data)
...
@@ -816,8 +808,7 @@ Event_queue::get_top_for_execution_if_time(THD *thd, Event_job_data **job_data)
if
(
to_free
)
if
(
to_free
)
delete
top
;
delete
top
;
DBUG_PRINT
(
"info"
,
(
"returning %d et_new: 0x%lx get_timespec_sec(abstime): %ld "
,
DBUG_PRINT
(
"info"
,
(
"returning %d et_new: 0x%lx "
,
ret
,
(
long
)
*
job_data
));
ret
,
(
long
)
*
job_data
,
abstime
?
get_timespec_sec
(
*
abstime
)
:
0
));
if
(
*
job_data
)
if
(
*
job_data
)
DBUG_PRINT
(
"info"
,
(
"db: %s name: %s definer=%s"
,
(
*
job_data
)
->
dbname
.
str
,
DBUG_PRINT
(
"info"
,
(
"db: %s name: %s definer=%s"
,
(
*
job_data
)
->
dbname
.
str
,
...
...
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