Commit a811fd23 authored by msvensson@shellback's avatar msvensson@shellback

Merge maint1:/data/localhome/msvensson/mysql-5.1-new-maint

into  shellback.:C:/mysql/mysql-5.1-new-maint
parents 777debdc 395a0167
......@@ -699,10 +699,7 @@ static const char *queue_wait_msg= "Waiting for next activation";
RETURN VALUE
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
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.
Could be that there is no top.
TRUE Error
*/
......@@ -712,7 +709,6 @@ Event_queue::get_top_for_execution_if_time(THD *thd, Event_job_data **job_data)
{
bool ret= FALSE;
struct timespec top_time;
struct timespec *abstime;
Event_queue_element *top= NULL;
bool to_free= FALSE;
bool to_drop= FALSE;
......@@ -724,44 +720,40 @@ Event_queue::get_top_for_execution_if_time(THD *thd, Event_job_data **job_data)
{
int res;
thd->end_time();
time_t now= thd->query_start();
abstime= NULL;
if (queue.elements)
/* Break loop if thd has been killed */
if (thd->killed)
{
top= ((Event_queue_element*) queue_element(&queue, 0));
set_timespec(top_time,
sec_since_epoch_TIME(&top->execute_at) - now);
abstime= &top_time;
DBUG_PRINT("info", ("thd->killed=%d", thd->killed));
goto end;
}
if (!abstime || get_timespec_sec(*abstime) > now)
{
const char *msg;
if (abstime)
{
next_activation_at= top->execute_at;
msg= queue_wait_msg;
}
else
if (!queue.elements)
{
/* There are no events in the queue */
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__);
if (thd->killed)
top= ((Event_queue_element*) queue_element(&queue, 0));
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
the beginning. Moreover, this way we will get also the new top, if
the element at the top has been changed.
Not yet time for top event, wait on condition with
time or until signaled. Release LOCK_queue while waiting.
*/
set_timespec(top_time, seconds_to_next_event);
cond_wait(thd, &top_time, queue_wait_msg, SCHED_FUNC, __LINE__);
continue;
}
......@@ -803,7 +795,7 @@ Event_queue::get_top_for_execution_if_time(THD *thd, Event_job_data **job_data)
else
queue_replaced(&queue);
dbug_dump_queue(now);
dbug_dump_queue(thd->query_start());
break;
}
end:
......@@ -816,8 +808,7 @@ Event_queue::get_top_for_execution_if_time(THD *thd, Event_job_data **job_data)
if (to_free)
delete top;
DBUG_PRINT("info", ("returning %d et_new: 0x%lx get_timespec_sec(abstime): %ld ",
ret, (long) *job_data, abstime ? get_timespec_sec(*abstime) : 0));
DBUG_PRINT("info", ("returning %d et_new: 0x%lx ", ret, (long) *job_data));
if (*job_data)
DBUG_PRINT("info", ("db: %s name: %s definer=%s", (*job_data)->dbname.str,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment