← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/signal_handler.cc

  • Committer: Mark Atwood
  • Date: 2011-08-11 03:05:03 UTC
  • mfrom: (2385.1.12 refactor4)
  • Revision ID: me@mark.atwood.name-20110811030503-rp9xjihc5x3y0x4q
merge lp:~olafvdspek/drizzle/refactor4

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/signal_handler.cc
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#include "config.h"
 
20
#include <config.h>
21
21
 
22
22
#include <signal.h>
23
23
 
24
 
#include "drizzled/signal_handler.h"
25
 
#include "drizzled/drizzled.h"
26
 
#include "drizzled/session.h"
27
 
#include "drizzled/session/cache.h"
28
 
#include "drizzled/internal/my_sys.h"
29
 
#include "drizzled/probes.h"
30
 
#include "drizzled/plugin.h"
31
 
#include "drizzled/plugin/scheduler.h"
32
 
 
33
 
#include "drizzled/util/backtrace.h"
 
24
#include <drizzled/signal_handler.h>
 
25
#include <drizzled/drizzled.h>
 
26
#include <drizzled/session.h>
 
27
#include <drizzled/session/cache.h>
 
28
#include <drizzled/internal/my_sys.h>
 
29
#include <drizzled/probes.h>
 
30
#include <drizzled/plugin.h>
 
31
#include <drizzled/plugin/scheduler.h>
 
32
#include <drizzled/current_session.h>
 
33
#include <drizzled/util/backtrace.h>
 
34
#include <drizzled/statistics_variables.h>
 
35
#include <drizzled/system_variables.h>
34
36
 
35
37
using namespace drizzled;
36
38
 
71
73
  Session *session= current_session;
72
74
  if (session)
73
75
  {
74
 
    Session::shared_ptr session_ptr(session::Cache::singleton().find(session->getSessionId()));
 
76
    Session::shared_ptr session_ptr(session::Cache::find(session->getSessionId()));
75
77
    if (not session_ptr) // We need to make we have a lock on session before we do anything with it.
76
78
      return;
77
79
 
151
153
                    "Hope that's ok; if not, decrease some variables in the "
152
154
                    "equation.\n\n"));
153
155
 
154
 
  drizzled::util::custom_backtrace();
 
156
  call_backtrace();
155
157
 
156
158
  write_core(sig);
157
159