Merge lp:~skinny.moey/drizzle/user_scoreboard into lp:~drizzle-trunk/drizzle/development

[Joe Daly]

The logging_stats.slap test was failing on OSX, the locks were mistakenly not being init'd or destroyed. It "seemed" to work on the other platforms but debug code definitely showed the lock not doing anything on OSX (hades) when it was not init'd, too bad it didnt crash that would have been easier to locate.

This change also adds a change to ignore session 0 as only the postEnd() method gets called and not the post() method for this session, I assume this is because of how the initial plugins storage engine connection is made.

I will re-visit the locks in my next patch for this code, as one of them should be able to be removed.

[Joe Daly (skinny.moey)]

removed cout statements, those were not to be in the review.

[Monty Taylor (mordred)]

Wow. Yeah - now that you point it out, that makes perfect sense.

Good catch!

review: Approve

[Jay Pipes (jaypipes)]

review: Approve

=== modified file 'plugin/logging_stats/logging_stats.cc'
--- plugin/logging_stats/logging_stats.cc	2010-03-25 02:26:39 +0000
+++ plugin/logging_stats/logging_stats.cc	2010-03-31 03:26:28 +0000
@@ -73,6 +73,7 @@
 
 LoggingStats::LoggingStats(string name_arg) : Logging(name_arg)
 {
+  (void) pthread_rwlock_init(&LOCK_scoreboard, NULL);
   scoreboard_size= sysvar_logging_stats_scoreboard_size;
   score_board_slots= new ScoreBoardSlot[scoreboard_size];
   for (uint32_t j=0; j < scoreboard_size; j++)
@@ -85,6 +86,7 @@
 
 LoggingStats::~LoggingStats()
 {
+  (void) pthread_rwlock_destroy(&LOCK_scoreboard);
   delete[] score_board_slots;
 }
 
@@ -152,7 +154,7 @@
 
 bool LoggingStats::post(Session *session)
 {
-  if (! isEnabled())
+  if (! isEnabled() || (session->getSessionId() == 0))
   {
     return false;
   }
@@ -225,7 +227,7 @@
 
 bool LoggingStats::postEnd(Session *session)
 {
-  if (! isEnabled())
+  if (! isEnabled() || (session->getSessionId() == 0)) 
   {
     return false;
   }