← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/multi_thread/multi_thread.cc

  • Committer: Brian Aker
  • Date: 2010-11-17 22:42:32 UTC
  • mto: This revision was merged to the branch mainline in revision 1938.
  • Revision ID: brian@tangent.org-20101117224232-ynuhmqsfpeaqnhpg
Cleanup session ownership rules such that we know exactly when session has
been removed

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/multi_thread/multi_thread.cc
38
38
  extern size_t my_thread_stack_size;
39
39
}
40
40
 
41
 
void MultiThreadScheduler::runSession(drizzled::Session::Ptr session)
 
41
void MultiThreadScheduler::runSession(drizzled::session_id_t id)
42
42
{
 
43
  char stack_dummy;
 
44
  Session::shared_ptr session(session::Cache::singleton().find(id));
 
45
 
 
46
  if (not session)
 
47
  {
 
48
    std::cerr << "Session killed before thread could execute\n";
 
49
    return;
 
50
  }
 
51
 
43
52
  if (drizzled::internal::my_thread_init())
44
53
  {
45
54
    session->disconnect(drizzled::ER_OUT_OF_RESOURCES, true);
48
57
  }
49
58
  boost::this_thread::at_thread_exit(&internal::my_thread_end);
50
59
 
51
 
  session->thread_stack= (char*) &session;
 
60
  session->thread_stack= (char*) &stack_dummy;
52
61
  session->run();
53
62
  killSessionNow(session);
 
63
  // @todo remove hard spin by disconnection the session first from the
 
64
  // thread.
 
65
  while (not session.unique()) {}
54
66
}
55
67
 
56
68
void MultiThreadScheduler::setStackSize()
91
103
#endif
92
104
}
93
105
 
94
 
bool MultiThreadScheduler::addSession(Session::Ptr session)
 
106
bool MultiThreadScheduler::addSession(Session::shared_ptr &session)
95
107
{
96
108
  if (thread_count >= max_threads)
97
109
    return true;
98
110
 
99
111
  thread_count.increment();
100
112
 
101
 
  boost::thread new_thread(boost::bind(&MultiThreadScheduler::runSession, this, session));
 
113
  boost::thread new_thread(boost::bind(&MultiThreadScheduler::runSession, this, session->getSessionId()));
102
114
 
103
115
  if (not new_thread.joinable())
104
116
  {
110
122
}
111
123
 
112
124
 
113
 
void MultiThreadScheduler::killSessionNow(Session *session)
 
125
void MultiThreadScheduler::killSessionNow(Session::shared_ptr &session)
114
126
{
115
127
  /* Locks LOCK_thread_count and deletes session */
116
128
  Session::unlink(session);