← 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-27 13:38:27 UTC
  • mfrom: (1955.1.3 quick)
  • Revision ID: brian@tangent.org-20101127133827-fowoi26sizq1zneg
Rollup of staging, mostly UDL

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/multi_thread/multi_thread.cc
132
132
}
133
133
 
134
134
 
135
 
void MultiThreadScheduler::killSession(Session *session)
136
 
{
137
 
  boost_thread_shared_ptr thread(session->getThread());
138
 
 
139
 
  if (thread)
140
 
  {
141
 
    thread->interrupt();
142
 
  }
143
 
}
144
 
 
145
135
void MultiThreadScheduler::killSessionNow(Session::shared_ptr &session)
146
136
{
147
 
  killSession(session.get());
148
137
  /* Locks LOCK_thread_count and deletes session */
149
138
  Session::unlink(session);
150
139
  thread_count.decrement();