← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/plugin/scheduler.cc

  • Committer: Lee Bieber
  • Date: 2010-12-05 01:08:39 UTC
  • mfrom: (1966.2.15 catalogs)
  • Revision ID: kalebral@gmail.com-20101205010839-aht6yw6wdcwejlt1
Merge Brian - more cleanup of share pointers

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/plugin/scheduler.cc
26
26
#include "drizzled/gettext.h"
27
27
#include "drizzled/errmsg_print.h"
28
28
 
29
 
using namespace std;
30
 
 
31
29
namespace drizzled
32
30
{
33
31
 
34
32
extern size_t my_thread_stack_size;
35
33
 
36
 
vector<plugin::Scheduler *> all_schedulers;
 
34
std::vector<plugin::Scheduler *> all_schedulers;
37
35
 
38
36
/* Globals (TBK) */
39
37
static plugin::Scheduler *scheduler= NULL;
40
38
 
41
39
 
42
 
class FindSchedulerByName : public unary_function<plugin::Scheduler *, bool>
 
40
class FindSchedulerByName : public std::unary_function<plugin::Scheduler *, bool>
43
41
{
44
 
  const string *name;
 
42
  const std::string *name;
45
43
public:
46
 
  FindSchedulerByName(const string *name_arg)
 
44
  FindSchedulerByName(const std::string *name_arg)
47
45
    : name(name_arg) {}
48
46
  result_type operator() (argument_type sched)
49
47
  {
54
52
 
55
53
bool plugin::Scheduler::addPlugin(plugin::Scheduler *sched)
56
54
{
57
 
  vector<plugin::Scheduler *>::iterator iter=
58
 
    find_if(all_schedulers.begin(), all_schedulers.end(), 
 
55
  std::vector<plugin::Scheduler *>::iterator iter=
 
56
    std::find_if(all_schedulers.begin(), all_schedulers.end(), 
59
57
            FindSchedulerByName(&sched->getName()));
60
58
 
61
59
  if (iter != all_schedulers.end())
76
74
 
77
75
void plugin::Scheduler::removePlugin(plugin::Scheduler *sched)
78
76
{
79
 
  all_schedulers.erase(find(all_schedulers.begin(),
 
77
  all_schedulers.erase(std::find(all_schedulers.begin(),
80
78
                            all_schedulers.end(),
81
79
                            sched));
82
80
}
83
81
 
84
82
 
85
 
bool plugin::Scheduler::setPlugin(const string& name)
 
83
bool plugin::Scheduler::setPlugin(const std::string& name)
86
84
{
87
 
  vector<plugin::Scheduler *>::iterator iter=
88
 
    find_if(all_schedulers.begin(), all_schedulers.end(), 
 
85
  std::vector<plugin::Scheduler *>::iterator iter=
 
86
    std::find_if(all_schedulers.begin(), all_schedulers.end(), 
89
87
            FindSchedulerByName(&name));
90
88
 
91
89
  if (iter != all_schedulers.end())