Merge lp:~vjsamuel/drizzle/rplugin-pool-of-threads into lp:~drizzle-trunk/drizzle/development

[Vijay Samuel]

[Monty Taylor (mordred)]

Sort of looks like you pushed your memcached_stats branch here by mistake. :)

review: Needs Fixing

[Vijay Samuel (vjsamuel)]

I am so sorry! will have it fixed asap.

=== modified file 'plugin/pool_of_threads/pool_of_threads.cc'
--- plugin/pool_of_threads/pool_of_threads.cc	2010-05-18 18:20:56 +0000
+++ plugin/pool_of_threads/pool_of_threads.cc	2010-08-04 03:34:03 +0000
@@ -23,12 +23,14 @@
 #include <plugin/pool_of_threads/pool_of_threads.h>
 #include "drizzled/pthread_globals.h"
 #include "drizzled/internal/my_pthread.h"
+#include <boost/program_options.hpp>
+#include <drizzled/module/option_map.h>
 
+namespace po= boost::program_options;
 using namespace std;
 using namespace drizzled;
 
 /* Global's (TBR) */
-static PoolOfThreadsScheduler *scheduler= NULL;
 
 /**
  * Set this to true to trigger killing of all threads in the pool
@@ -56,7 +58,7 @@
   void libevent_kill_session_callback(int Fd, short Operation, void *ctx);
 }
 
-static uint32_t pool_size= 0;
+static uint32_t pool_size;
 
 /**
  * @brief 
@@ -638,10 +640,20 @@
  */
 static int init(drizzled::module::Context &context)
 {
+  const module::option_map &vm= context.getOptions();
+ 
+  if (vm.count("size"))
+  {
+    if (pool_size > 1024 || pool_size < 1)
+    {
+      errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value for size\n"));
+      exit(-1);
+    }
+  }
+
   assert(pool_size != 0);
 
-  scheduler= new PoolOfThreadsScheduler("pool_of_threads");
-  context.add(scheduler);
+  context.add(new PoolOfThreadsScheduler("pool_of_threads"));
 
   return 0;
 }
@@ -655,6 +667,13 @@
                            N_("Size of Pool."),
                            NULL, NULL, 8, 1, 1024, 0);
 
+static void init_options(drizzled::module::option_context &context)
+{
+  context("size",
+          po::value<uint32_t>(&pool_size)->default_value(8),
+          N_("Size of Pool."));
+}
+
 static drizzle_sys_var* sys_variables[]= {
   DRIZZLE_SYSVAR(size),
   NULL,
@@ -670,6 +689,6 @@
   PLUGIN_LICENSE_GPL,
   init, /* Plugin Init */
   sys_variables,   /* system variables */
-  NULL    /* config options */
+  init_options    /* config options */
 }
 DRIZZLE_DECLARE_PLUGIN_END;

=== removed file 'po/POTFILES.in'
--- po/POTFILES.in	2010-07-27 00:41:57 +0000
+++ po/POTFILES.in	1970-01-01 00:00:00 +0000
@@ -1,99 +0,0 @@
-client/drizzle.cc
-client/drizzledump.cc
-client/drizzleimport.cc
-client/drizzleslap.cc
-client/drizzletest.cc
-drizzled/cursor.cc
-drizzled/db.cc
-drizzled/drizzled.cc
-drizzled/error.cc
-drizzled/gettext.h
-drizzled/ha_commands.cc
-drizzled/identifier/schema.cc
-drizzled/identifier/table.cc
-drizzled/internal/default.cc
-drizzled/main.cc
-drizzled/message/transaction_reader.cc
-drizzled/message/transaction_writer.cc
-drizzled/module/library.cc
-drizzled/module/loader.cc
-drizzled/module/registry.h
-drizzled/option.cc
-drizzled/plugin/authentication.cc
-drizzled/plugin/authorization.cc
-drizzled/plugin/error_message.cc
-drizzled/plugin/event_observer.cc
-drizzled/plugin/function.cc
-drizzled/plugin/listen.cc
-drizzled/plugin/listen_tcp.cc
-drizzled/plugin/logging.cc
-drizzled/plugin/query_cache.cc
-drizzled/plugin/query_rewrite.cc
-drizzled/plugin/scheduler.cc
-drizzled/plugin/schema_engine.cc
-drizzled/plugin/storage_engine.cc
-drizzled/plugin/table_function.cc
-drizzled/plugin/xa_resource_manager.cc
-drizzled/plugin/xa_storage_engine.cc
-drizzled/replication_services.cc
-drizzled/session.cc
-drizzled/set_var.cc
-drizzled/show.cc
-drizzled/signal_handler.cc
-drizzled/sql_base.cc
-drizzled/sql_select.cc
-drizzled/sql_table.cc
-drizzled/sql_yacc.cc
-drizzled/stacktrace.cc
-drizzled/statement/alter_table.cc
-drizzled/table.cc
-drizzled/table_share.cc
-drizzled/transaction_services.cc
-drizzled/tztime.cc
-gnulib/getopt.c
-gnulib/gettext.h
-plugin/auth_file/auth_file.cc
-plugin/auth_http/auth_http.cc
-plugin/auth_ldap/auth_ldap.cc
-plugin/blitzdb/ha_blitz.h
-plugin/console/console.cc
-plugin/default_replicator/default_replicator.cc
-plugin/drizzle_protocol/drizzle_protocol.cc
-plugin/drizzle_protocol/errmsg.cc
-plugin/embedded_innodb/embedded_innodb_engine.cc
-plugin/errmsg_notify/errmsg_notify.cc
-plugin/errmsg_stderr/errmsg_stderr.cc
-plugin/filtered_replicator/filtered_replicator.cc
-plugin/hello_events/hello_events.cc
-plugin/innobase/handler/data_dictionary.cc
-plugin/innobase/ut/ut0auxconf_pause.c
-plugin/logging_gearman/logging_gearman.cc
-plugin/logging_query/logging_query.cc
-plugin/logging_stats/logging_stats.cc
-plugin/md5/md5.cc
-plugin/memcached_stats/analysis_table.cc
-plugin/memcached_stats/memcached_stats.cc
-plugin/memcached_stats/stats_table.cc
-plugin/multi_thread/multi_thread.cc
-plugin/multi_thread/multi_thread.h
-plugin/myisam/ha_myisam.cc
-plugin/myisam/my_handler_errors.cc
-plugin/mysql_protocol/mysql_protocol.cc
-plugin/pbms/src/parameters_ms.cc
-plugin/pool_of_threads/pool_of_threads.cc
-plugin/pool_of_threads/pool_of_threads.h
-plugin/pool_of_threads/session_scheduler.cc
-plugin/rabbitmq/rabbitmq_log.cc
-plugin/signal_handler/signal_handler.cc
-plugin/single_thread/single_thread.h
-plugin/syslog/errmsg.cc
-plugin/syslog/function.cc
-plugin/syslog/logging.cc
-plugin/syslog/module.cc
-plugin/transaction_log/background_worker.cc
-plugin/transaction_log/hexdump_transaction_message.cc
-plugin/transaction_log/module.cc
-plugin/transaction_log/print_transaction_message.cc
-plugin/transaction_log/transaction_log.cc
-plugin/transaction_log/transaction_log_reader.cc
-plugin/transaction_log/write_buffer.cc