Below is the list of changes that have just been committed into a local
5.0 repository of cmiller. When cmiller does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2007-03-28 10:04:43-04:00, cmiller@stripped +2 -0
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-comeng--bug24795
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-comeng
MERGE: 1.2392.35.10
BitKeeper/etc/ignore@stripped, 2007-03-28 10:00:49-04:00, cmiller@stripped +1 -1
auto-union
MERGE: 1.241.3.1
sql/sql_profile.cc@stripped, 2007-03-28 10:04:41-04:00, cmiller@stripped +1 -3
Manual merge
MERGE: 1.4.1.2
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: cmiller
# Host: zippy.cornsilk.net
# Root: /home/cmiller/work/mysql/mysql-5.0-comeng/RESYNC
--- 1.5/sql/sql_profile.cc 2007-03-11 20:36:37 -04:00
+++ 1.6/sql/sql_profile.cc 2007-03-28 10:04:41 -04:00
@@ -72,6 +72,9 @@
time_usecs(0.0), allocated_status_memory(NULL)
{
collect();
+
+ /* The beginning of the query, before any state is set. */
+ set_status("(initialization)", NULL, NULL, 0);
}
PROFILE_ENTRY::PROFILE_ENTRY(QUERY_PROFILE *profile_arg, const char *status_arg)
@@ -313,10 +316,7 @@
SELECT_LEX_UNIT *unit= &thd->lex->unit;
ha_rows idx= 0;
unit->set_limit(sel);
- double last_time= profile_start.time_usecs;
-#ifdef HAVE_GETRUSAGE
- struct rusage *last_rusage= &(profile_start.rusage);
-#endif
+ PROFILE_ENTRY *previous= &profile_start;
PROFILE_ENTRY *entry;
void *iterator;
@@ -337,8 +337,18 @@
break;
protocol->prepare_for_resend();
- protocol->store(entry->status, strlen(entry->status), system_charset_info);
- protocol->store((double)(entry->time_usecs - last_time)/(1000.0*1000),
+
+ /*
+ This entry, n, has a point in time, T(n), and a status phrase, S(n). The
+ status phrase S(n) describes the period of time that begins at T(n). The
+ previous status phrase S(n-1) describes the period of time that starts at
+ T(n-1) and ends at T(n). Since we want to describe the time that a status
+ phrase took T(n)-T(n-1), this line must describe the previous status.
+ */
+ protocol->store(previous->status, strlen(previous->status),
+ system_charset_info);
+ protocol->store((double)(entry->time_usecs -
+ previous->time_usecs)/(1000.0*1000),
(uint32) TIME_FLOAT_DIGITS-1, &elapsed);
if (options & PROFILE_CPU)
@@ -346,10 +356,10 @@
#ifdef HAVE_GETRUSAGE
String cpu_utime, cpu_stime;
protocol->store((double)(RUSAGE_DIFF_USEC(rusage->ru_utime,
- last_rusage->ru_utime))/(1000.0*1000),
+ previous->rusage.ru_utime))/(1000.0*1000),
(uint32) TIME_FLOAT_DIGITS-1, &cpu_utime);
protocol->store((double)(RUSAGE_DIFF_USEC(rusage->ru_stime,
- last_rusage->ru_stime))/(1000.0*1000),
+ previous->rusage.ru_stime))/(1000.0*1000),
(uint32) TIME_FLOAT_DIGITS-1, &cpu_stime);
#else
protocol->store_null();
@@ -360,8 +370,8 @@
if (options & PROFILE_CONTEXT)
{
#ifdef HAVE_GETRUSAGE
- protocol->store((uint32)(rusage->ru_nvcsw - last_rusage->ru_nvcsw));
- protocol->store((uint32)(rusage->ru_nivcsw - last_rusage->ru_nivcsw));
+ protocol->store((uint32)(rusage->ru_nvcsw - previous->rusage.ru_nvcsw));
+ protocol->store((uint32)(rusage->ru_nivcsw - previous->rusage.ru_nivcsw));
#else
protocol->store_null();
protocol->store_null();
@@ -370,9 +380,9 @@
if (options & PROFILE_BLOCK_IO)
{
-#ifdef HAVE_GETRUSAGE
- protocol->store((uint32)(rusage->ru_inblock - last_rusage->ru_inblock));
- protocol->store((uint32)(rusage->ru_oublock - last_rusage->ru_oublock));
+#if defined(HAVE_GETRUSAGE) && defined(HAVE_GETRUSAGE_USEFUL_BLOCKIO)
+ protocol->store((uint32)(rusage->ru_inblock - previous->rusage.ru_inblock));
+ protocol->store((uint32)(rusage->ru_oublock - previous->rusage.ru_oublock));
#else
protocol->store_null();
protocol->store_null();
@@ -382,8 +392,8 @@
if (options & PROFILE_IPC)
{
#ifdef HAVE_GETRUSAGE
- protocol->store((uint32)(rusage->ru_msgsnd - last_rusage->ru_msgsnd));
- protocol->store((uint32)(rusage->ru_msgrcv - last_rusage->ru_msgrcv));
+ protocol->store((uint32)(rusage->ru_msgsnd - previous->rusage.ru_msgsnd));
+ protocol->store((uint32)(rusage->ru_msgrcv - previous->rusage.ru_msgrcv));
#else
protocol->store_null();
protocol->store_null();
@@ -393,8 +403,8 @@
if (options & PROFILE_PAGE_FAULTS)
{
#ifdef HAVE_GETRUSAGE
- protocol->store((uint32)(rusage->ru_majflt - last_rusage->ru_majflt));
- protocol->store((uint32)(rusage->ru_minflt - last_rusage->ru_minflt));
+ protocol->store((uint32)(rusage->ru_majflt - previous->rusage.ru_majflt));
+ protocol->store((uint32)(rusage->ru_minflt - previous->rusage.ru_minflt));
#else
protocol->store_null();
protocol->store_null();
@@ -404,7 +414,7 @@
if (options & PROFILE_SWAPS)
{
#ifdef HAVE_GETRUSAGE
- protocol->store((uint32)(rusage->ru_nswap - last_rusage->ru_nswap));
+ protocol->store((uint32)(rusage->ru_nswap - previous->rusage.ru_nswap));
#else
protocol->store_null();
#endif
@@ -428,11 +438,7 @@
if (protocol->write())
DBUG_RETURN(TRUE);
- last_time= entry->time_usecs;
-#ifdef HAVE_GETRUSAGE
- last_rusage= &(entry->rusage);
-#endif
-
+ previous= entry;
}
send_eof(thd);
DBUG_RETURN(FALSE);
@@ -648,12 +654,7 @@
history_iterator= history.iterator_next(history_iterator))
{
query= history.iterator_value(history_iterator);
-
- PROFILE_ENTRY *ps= &(query->profile_start);
- double last_time= ps->time_usecs;
-#ifdef HAVE_GETRUSAGE
- struct rusage *last_rusage= &(ps->rusage);
-#endif
+ PROFILE_ENTRY *previous= &(query->profile_start);
/*
Because we put all profiling info into a table that may be reordered, let
@@ -668,10 +669,7 @@
for (seq= 0, entry_iterator= query->entries.new_iterator();
entry_iterator != NULL;
entry_iterator= query->entries.iterator_next(entry_iterator),
-#ifdef HAVE_GETRUSAGE
- last_rusage= &(entry->rusage),
-#endif
- seq++, last_time= entry->time_usecs, row_number++)
+ seq++, previous= entry, row_number++)
{
entry= query->entries.iterator_value(entry_iterator);
@@ -685,16 +683,25 @@
*/
table->field[0]->store((ulonglong) query->profiling_query_id);
table->field[1]->store((ulonglong) seq); /* the step in the sequence */
- table->field[2]->store(entry->status, strlen(entry->status),
+ /*
+ This entry, n, has a point in time, T(n), and a status phrase, S(n).
+ The status phrase S(n) describes the period of time that begins at
+ T(n). The previous status phrase S(n-1) describes the period of time
+ that starts at T(n-1) and ends at T(n). Since we want to describe the
+ time that a status phrase took T(n)-T(n-1), this line must describe the
+ previous status.
+ */
+ table->field[2]->store(previous->status, strlen(previous->status),
system_charset_info);
- table->field[3]->store((double)(entry->time_usecs - last_time)/(1000*1000));
+ table->field[3]->store((double)(entry->time_usecs -
+ previous->time_usecs)/(1000*1000));
#ifdef HAVE_GETRUSAGE
table->field[4]->store((double)RUSAGE_DIFF_USEC(entry->rusage.ru_utime,
- last_rusage->ru_utime)/(1000.0*1000));
+ previous->rusage.ru_utime)/(1000.0*1000));
table->field[4]->set_notnull();
table->field[5]->store((double)RUSAGE_DIFF_USEC(entry->rusage.ru_stime,
- last_rusage->ru_stime)/(1000.0*1000));
+ previous->rusage.ru_stime)/(1000.0*1000));
table->field[5]->set_notnull();
#else
@@ -702,43 +709,52 @@
#endif
#ifdef HAVE_GETRUSAGE
- table->field[6]->store((uint32)(entry->rusage.ru_nvcsw - last_rusage->ru_nvcsw));
+ table->field[6]->store((uint32)(entry->rusage.ru_nvcsw -
+ previous->rusage.ru_nvcsw));
table->field[6]->set_notnull();
- table->field[7]->store((uint32)(entry->rusage.ru_nivcsw - last_rusage->ru_nivcsw));
+ table->field[7]->store((uint32)(entry->rusage.ru_nivcsw -
+ previous->rusage.ru_nivcsw));
table->field[7]->set_notnull();
#else
/* TODO: Add context switch info for non-BSD systems */
#endif
-#ifdef HAVE_GETRUSAGE
- table->field[8]->store((uint32)(entry->rusage.ru_inblock - last_rusage->ru_inblock));
+#if defined(HAVE_GETRUSAGE) && defined(HAVE_GETRUSAGE_USEFUL_BLOCKIO)
+ table->field[8]->store((uint32)(entry->rusage.ru_inblock -
+ previous->rusage.ru_inblock));
table->field[8]->set_notnull();
- table->field[9]->store((uint32)(entry->rusage.ru_oublock - last_rusage->ru_oublock));
+ table->field[9]->store((uint32)(entry->rusage.ru_oublock -
+ previous->rusage.ru_oublock));
table->field[9]->set_notnull();
#else
/* TODO: Add block IO info for non-BSD systems */
#endif
#ifdef HAVE_GETRUSAGE
- table->field[10]->store((uint32)(entry->rusage.ru_msgsnd - last_rusage->ru_msgsnd), true);
+ table->field[10]->store((uint32)(entry->rusage.ru_msgsnd -
+ previous->rusage.ru_msgsnd), true);
table->field[10]->set_notnull();
- table->field[11]->store((uint32)(entry->rusage.ru_msgrcv - last_rusage->ru_msgrcv), true);
+ table->field[11]->store((uint32)(entry->rusage.ru_msgrcv -
+ previous->rusage.ru_msgrcv), true);
table->field[11]->set_notnull();
#else
/* TODO: Add message info for non-BSD systems */
#endif
#ifdef HAVE_GETRUSAGE
- table->field[12]->store((uint32)(entry->rusage.ru_majflt - last_rusage->ru_majflt), true);
+ table->field[12]->store((uint32)(entry->rusage.ru_majflt -
+ previous->rusage.ru_majflt), true);
table->field[12]->set_notnull();
- table->field[13]->store((uint32)(entry->rusage.ru_minflt - last_rusage->ru_minflt), true);
+ table->field[13]->store((uint32)(entry->rusage.ru_minflt -
+ previous->rusage.ru_minflt), true);
table->field[13]->set_notnull();
#else
/* TODO: Add page fault info for non-BSD systems */
#endif
#ifdef HAVE_GETRUSAGE
- table->field[14]->store((uint32)(entry->rusage.ru_nswap - last_rusage->ru_nswap), true);
+ table->field[14]->store((uint32)(entry->rusage.ru_nswap -
+ previous->rusage.ru_nswap), true);
table->field[14]->set_notnull();
#else
/* TODO: Add swap info for non-BSD systems */
--- 1.245/BitKeeper/etc/ignore 2007-03-21 09:27:25 -04:00
+++ 1.246/BitKeeper/etc/ignore 2007-03-28 10:00:49 -04:00
@@ -595,6 +595,7 @@
libmysqld/sql_olap.cc
libmysqld/sql_parse.cc
libmysqld/sql_prepare.cc
+libmysqld/sql_profile.cc
libmysqld/sql_rename.cc
libmysqld/sql_repl.cc
libmysqld/sql_select.cc
| Thread |
|---|
| • bk commit into 5.0 tree (cmiller:1.2421) | Chad MILLER | 28 Mar |
