← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Brian Aker
  • Date: 2010-12-30 17:09:51 UTC
  • mto: (2041.2.1 clean)
  • mto: This revision was merged to the branch mainline in revision 2043.
  • Revision ID: brian@tangent.org-20101230170951-8kytgcyl7qjkfy8b
Switched connection_count to use boost atomic.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
37
37
#include <boost/thread/shared_mutex.hpp>
38
38
#include <boost/thread/condition_variable.hpp>
39
39
#include <boost/filesystem.hpp>
 
40
#include <boost/detail/atomic_count.hpp>
40
41
 
41
42
#include "drizzled/internal/my_sys.h"
42
43
#include "drizzled/internal/my_bit.h"
351
352
 
352
353
passwd *user_info;
353
354
 
354
 
atomic<uint32_t> connection_count;
 
355
boost::detail::atomic_count connection_count(0);
355
356
 
356
357
global_buffer_constraint<uint64_t> global_sort_buffer(0);
357
358
global_buffer_constraint<uint64_t> global_join_buffer(0);
637
638
 
638
639
void drizzled::Session::unlink(Session::shared_ptr &session)
639
640
{
640
 
  connection_count.decrement();
 
641
  --connection_count;
641
642
 
642
643
  session->cleanup();
643
644
 
2196
2197
#else
2197
2198
  have_symlink=SHOW_OPTION_YES;
2198
2199
#endif
2199
 
 
2200
 
  connection_count= 0;
2201
2200
}
2202
2201
 
2203
2202