← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/current_session.cc

  • Committer: Brian Aker
  • Date: 2009-12-18 18:31:01 UTC
  • mfrom: (1241.2.7 build)
  • Revision ID: brian@gaz-20091218183101-igqg1dtowpa0o70s
Fixed from Monty.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/current_session.cc
1
1
/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
2
2
 *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
3
3
 *
4
 
 *  Copyright (C) 2008 Sun Microsystems, Inc.
 
4
 *  Copyright (C) 2008 Sun Microsystems
5
5
 *
6
6
 *  This program is free software; you can redistribute it and/or modify
7
7
 *  it under the terms of the GNU General Public License as published by
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#include "config.h"
 
20
#include <drizzled/server_includes.h>
21
21
#include <drizzled/current_session.h>
22
22
 
23
 
namespace drizzled
24
 
{
25
 
 
26
 
static MySessionVar THR_Session;
27
 
static MyMemoryRootVar THR_Mem_root;
28
 
 
29
 
MySessionVar &currentSession(void)
30
 
{
31
 
  return THR_Session;
32
 
}
33
 
 
34
 
MyMemoryRootVar &currentMemRoot(void)
35
 
{
36
 
  return THR_Mem_root;
37
 
}
 
23
#include <pthread.h>
 
24
 
 
25
extern pthread_key_t THR_Session;
 
26
extern pthread_key_t THR_Mem_root;
38
27
 
39
28
Session *_current_session(void)
40
29
{
41
 
  return THR_Session.get();
 
30
  return static_cast<Session *>(pthread_getspecific(THR_Session));
42
31
}
43
32
 
44
 
memory::Root *current_mem_root(void)
 
33
 
 
34
MEM_ROOT *current_mem_root(void)
45
35
{
46
 
  return *(currentMemRoot().get());
 
36
  return *(static_cast<MEM_ROOT **>(pthread_getspecific(THR_Mem_root)));
47
37
}
48
 
 
49
 
} /* namespace drizzled */