← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/logging_stats/scoreboard.h

  • Committer: lbieber
  • Date: 2010-08-08 05:04:06 UTC
  • mfrom: (1694.2.1 staging)
  • Revision ID: lbieber@orisndriz03-20100808050406-h9b0lzvpwkp3ng2x
 Merge Stewart - recent patch didn't have updated result files for embedded_innodb when the handling of default values was fixed in the table proto
 Merge Joe Daly - use boost::shared_mutex for locking

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/logging_stats/scoreboard.h
33
33
 
34
34
#include "scoreboard_slot.h"
35
35
#include <drizzled/session.h>
 
36
#include <boost/thread/shared_mutex.hpp>
36
37
 
37
38
#include <vector>
38
39
 
70
71
    return number_buckets;
71
72
  }
72
73
 
73
 
  std::vector<pthread_rwlock_t* >* getVectorOfScoreboardLocks()
 
74
  std::vector<boost::shared_mutex* >* getVectorOfScoreboardLocks()
74
75
  {
75
76
    return &vector_of_scoreboard_locks;
76
77
  }
84
85
  uint32_t number_sessions;
85
86
  uint32_t number_buckets;
86
87
  std::vector<std::vector<ScoreboardSlot* >* > vector_of_scoreboard_vectors;
87
 
  std::vector<pthread_rwlock_t* > vector_of_scoreboard_locks;
 
88
  std::vector<boost::shared_mutex* > vector_of_scoreboard_locks;
88
89
 
89
90
  ScoreboardSlot* claimOpenScoreboardSlot(drizzled::Session *session); 
90
91
};