Merge lp:~mordred/gearmand/fix-1.0-build into lp:gearmand/1.0

[Monty Taylor]

Updates pandora.
Fixes boost linking.
Fixes the boost system header include file issue on FreeBSD.

[lp:~mordred/gearmand/fix-1.0-build]

358. By Monty Taylor on 2010-07-01

Remove two old crufty files.

359. By Monty Taylor on 2010-07-01

Updated pandora-build files to version 0.135

360. By Monty Taylor on 2010-07-01

Merged in no-error removal.

=== added file '.quickly'
--- .quickly	1970-01-01 00:00:00 +0000
+++ .quickly	2010-07-01 01:31:26 +0000
@@ -0,0 +1,5 @@
+project = gearmand
+version = 1.0
+template = pandora-build
+project-type = application
+pandora-version = 0.135

=== modified file 'ChangeLog'
--- ChangeLog	2010-06-30 20:04:51 +0000
+++ ChangeLog	2010-07-01 01:31:26 +0000
@@ -1,8 +1,22 @@
+<<<<<<< TREE
 0.14 Wed Jun 30 13:04:39 PDT 2010
   * Leak in SQLite resolved.
   * updated build configs
   * Increased testting.
 
+=======
+1.00 Mon Jun 14 12:17:09 PDT 2010
+ * Server written in C++ now.
+ * Making use of boost command line arguments.
+ * New debugging can now be done with the server.
+ * New Logger functionality added so that you can either use syslog, or
+   use stderr.
+ * It is possible to have "workers" internally in the server that act 
+   as internal services.
+
+
+
+>>>>>>> MERGE-SOURCE
 0.13 Sun Apr  4 14:45:08 PDT 2010
  * Fix for bug #518512.
  * Use OR REPLACE syntax for inserting items into the sqlite.

=== added file 'HACKING'
--- HACKING	1970-01-01 00:00:00 +0000
+++ HACKING	2010-07-01 01:31:26 +0000
@@ -0,0 +1,13 @@
+Hi!
+
+If you are working on the server here are some handy environmental variables
+you can set so that you can debug make test:
+
+GEARMAN_VALGRIND <- runs the server under valgrind.
+GEARMAN_MANUAL_GDB <-- runs the server under a remote version of GDB.
+GEARMAN_LOG <-- generates a log file for you with the output of the debug for the server
+
+GDB will pause the server while you do run the GDB command.
+
+Cheers,
+  -Brian

=== modified file 'Makefile.am'
--- Makefile.am	2010-06-30 15:21:36 +0000
+++ Makefile.am	2010-07-01 01:31:26 +0000
@@ -35,12 +35,13 @@
 TESTS += ${check_PROGRAMS}
 
 EXTRA_DIST+= \
-	docs/Doxyfile.api \
-	docs/Doxyfile.dev \
-	docs/api_header.html \
-	docs/dev_header.html \
-	docs/doxygen.h \
-	scripts/README.solaris
+	     HACKING \
+	     docs/Doxyfile.api \
+	     docs/Doxyfile.dev \
+	     docs/api_header.html \
+	     docs/dev_header.html \
+	     docs/doxygen.h \
+	     scripts/README.solaris
 
 docs: all
 	${DOXYGEN} docs/Doxyfile.api

=== modified file 'bin/gearman.c'
--- bin/gearman.c	2010-06-30 20:04:05 +0000
+++ bin/gearman.c	2010-07-01 01:31:26 +0000
@@ -588,9 +588,13 @@
   {
     ret= gearman_worker_work(&worker);
     if (ret != GEARMAN_SUCCESS)
+<<<<<<< TREE
     {
       GEARMAN_ERROR("gearman_worker_work:%s", gearman_worker_error(&worker));
     }
+=======
+      GEARMAN_ERROR("gearman_worker_work:%s", gearman_worker_error(&worker));
+>>>>>>> MERGE-SOURCE
 
     if (args->count > 0)
     {

=== modified file 'config/autorun.sh'
--- config/autorun.sh	2009-12-18 18:02:39 +0000
+++ config/autorun.sh	2010-07-01 01:31:26 +0000
@@ -35,7 +35,7 @@
 LIBTOOLIZE_FLAGS=" --automake --copy --force"
 # --add-missing instructs automake to install missing auxiliary files
 # and --force to overwrite them if they already exist
-AUTOMAKE_FLAGS="--add-missing --copy --force"
+AUTOMAKE_FLAGS="--add-missing --copy --force --foreign"
 ACLOCAL_FLAGS="-I m4"
 
 ARGV0=$0

=== added file 'config/pandora-plugin'
--- config/pandora-plugin	1970-01-01 00:00:00 +0000
+++ config/pandora-plugin	2010-07-01 01:31:26 +0000
@@ -0,0 +1,667 @@
+#!/usr/bin/python
+
+#  Copyright (C) 2009 Sun Microsystems
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; version 2 of the License.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+pandora_plugin_file = 'config/pandora-plugin.ini'
+
+# Find plugins in the tree and add them to the build system
+
+import ConfigParser, os, sys
+import datetime, time
+import subprocess
+
+plugin_am_file=None
+plugin_ac_file=None
+
+class ChangeProtectedFile(object):
+
+  def __init__(self, fname):
+    self.bogus_file= False
+    self.real_fname= fname
+    self.new_fname= "%s.new" % fname
+    try:
+      self.new_file= open(self.new_fname,'w+')
+    except IOError:
+      self.bogus_file= True
+
+  def write(self, text):
+    if not self.bogus_file:
+      self.new_file.write(text)
+
+  # We've written all of this out into .new files, now we only copy them
+  # over the old ones if they are different, so that we don't cause
+  # unnecessary recompiles
+  def close(self):
+    """Return True if the file had changed."""
+    if self.bogus_file:
+      return
+    self.new_file.seek(0)
+    new_content = self.new_file.read()
+    self.new_file.close()
+    try:
+        old_file = file(self.real_fname, 'r')
+        old_content = old_file.read()
+        old_file.close()
+    except IOError:
+        old_content = None
+    if new_content != old_content:
+      if old_content != None:
+        os.unlink(self.real_fname)
+      os.rename(self.new_fname, self.real_fname)
+      return True
+    else:
+        try:
+          os.unlink(self.new_fname)
+        except:
+          pass
+
+
+def write_external_configure(plugin, plugin_file):
+  """Write the initial bits of the configure.ac file"""
+  if not os.path.exists('m4'):
+    os.mkdir('m4')
+  plugin_file.write("""
+AC_PREREQ(2.59)dnl		Minimum Autoconf version required.
+AC_INIT([%(name)s],[%(version)s],[%(url)s])
+AC_CONFIG_SRCDIR([%(main_source)s])
+AC_CONFIG_AUX_DIR(config)
+
+PANDORA_CANONICAL_TARGET(less-warnings, warnings-always-on, require-cxx, force-gcc42,skip-visibility)
+
+PANDORA_REQUIRE_LIBPROTOBUF
+PANDORA_PROTOBUF_REQUIRE_VERSION([2.1.0])
+PANDORA_REQUIRE_PROTOC
+
+AC_LANG_PUSH(C++)
+PANDORA_REQUIRE_PTHREAD
+PANDORA_REQUIRE_LIBDL
+AC_LANG_POP
+
+PANDORA_USE_BETTER_MALLOC
+
+PANDORA_DRIZZLE_BUILD
+""" % plugin)
+
+  write_plugin_ac(plugin, plugin_file)
+
+  plugin_file.write("""
+AC_CONFIG_FILES(Makefile)
+
+AC_OUTPUT
+
+echo "---"
+echo "Configuration summary for $PACKAGE_NAME version $VERSION $PANDORA_RELEASE_COMMENT"
+echo ""
+echo "   * Installation prefix:       $prefix"
+echo "   * System type:               $host_vendor-$host_os"
+echo "   * Host CPU:                  $host_cpu"
+echo "   * C Compiler:                $CC_VERSION"
+echo "   * C++ Compiler:              $CXX_VERSION"
+echo "   * Debug enabled:             $with_debug"
+echo "   * Warnings as failure:       $ac_cv_warnings_as_errors"
+echo "   * C++ cstdint location:      $ac_cv_cxx_cstdint"
+echo "   * C++ hash_map location:     $ac_cv_cxx_hash_map"
+echo "   * C++ hash namespace:        $ac_cv_cxx_hash_namespace"
+echo "   * C++ shared_ptr namespace:  $ac_cv_shared_ptr_namespace"
+echo ""
+echo "---"
+
+  """ % plugin)
+
+def write_external_makefile(plugin, plugin_file):
+
+  plugin_file.write("""
+ACLOCAL_AMFLAGS = -I m4 --force
+VERSION=$(PANDORA_RELEASE_VERSION)
+
+pkgplugindir=%(pkgplugindir)s
+EXTRA_DIST = plugin.ini
+
+""" % plugin)
+  if plugin['headers'] != "":
+    plugin_file.write("noinst_HEADERS = %(headers)s\n" % plugin)
+  if plugin['install_headers'] != "":
+    plugin_file.write("nobase_include_HEADERS += %(install_headers)s\n" % plugin)
+  if plugin['testsuite']:
+    if plugin.has_key('testsuitedir') and plugin['testsuitedir'] != "":
+      plugin_file.write("EXTRA_DIST += %(testsuitedir)s\n" % plugin)
+  plugin_file.write("""
+pkgplugin_LTLIBRARIES=%(libname)s.la
+%(libname)s_la_LDFLAGS=-avoid-version -rpath $(pkgplugindir) $(AM_LDFLAGS) %(ldflags)s $(GCOV_LIBS)
+%(libname)s_la_LIBADD=%(libs)s
+%(libname)s_la_DEPENDENCIES=%(libs)s
+%(libname)s_la_CPPFLAGS=$(AM_CPPFLAGS) -DPANDORA_DYNAMIC_PLUGIN -DPANDORA_MODULE_NAME=%(module_name)s -DPANDORA_MODULE_AUTHOR='"%(author)s"' -DPANDORA_MODULE_TITLE='"%(title)s"' -DPANDORA_MODULE_VERSION='"%(version)s"' -DPANDORA_MODULE_LICENSE=%(license)s %(cppflags)s
+%(libname)s_la_CXXFLAGS=$(AM_CXXFLAGS) %(cxxflags)s
+%(libname)s_la_CFLAGS=$(AM_CFLAGS) %(cflags)s
+%(libname)s_la_SOURCES=%(sources)s
+check_PROGRAMS += %(tests)s
+""" % plugin)
+  plugin_am_file=os.path.join(plugin['rel_path'],'plugin.am')
+  if os.path.exists(plugin_am_file):
+    plugin_file.write('include %s\n' % plugin_am_file)
+
+def write_external_plugin():
+  """Return True if the plugin had changed."""
+  plugin = read_plugin_ini('.')
+  expand_plugin_ini(plugin)
+  plugin_file = ChangeProtectedFile('configure.ac')
+  write_external_configure(plugin, plugin_file)
+  result = plugin_file.close()
+  plugin_file = ChangeProtectedFile('Makefile.am')
+  write_external_makefile(plugin, plugin_file)
+  # Write some stub configure.ac and Makefile.am files that include the above
+  result = plugin_file.close() or result
+  return result
+
+def write_plugin(plugin, plugin_ini_list):
+  # Since this function is recursive, make sure we're not already in it.
+  if plugin.has_key('writing_status'):
+    if plugin['writing_status'] == 'done':
+      return
+    else:
+      print "Dependency loop detected with %s" % plugin['name']
+      exit(1)
+
+  plugin['writing_status'] = 'dependencies'
+
+  # Write all dependencies first to get around annoying automake bug
+  for dependency in plugin['dependency_list']:
+    found = False
+    for find_plugin in plugin_ini_list:
+      if find_plugin['module_name'] == dependency:
+        found = True
+        write_plugin(find_plugin, plugin_ini_list)
+        break
+    if found is False:
+      print "Could not find dependency %s: %s" % (plugin['name'], dependency)
+      exit(1)
+
+  write_plugin_ac(plugin, plugin_ac_file)
+  write_plugin_am(plugin, plugin_am_file)
+  plugin['writing_status'] = 'done'
+
+def write_plugin_ac(plugin, plugin_ac):
+  #
+  # Write plugin config instructions into plugin.ac file.
+  #
+  plugin_ac_file=os.path.join(plugin['rel_path'],'plugin.ac')
+  plugin_m4_dir=os.path.join(plugin['rel_path'],'m4')
+  plugin_m4_files=[]
+  if os.path.exists(plugin_m4_dir) and os.path.isdir(plugin_m4_dir):
+    for m4_file in os.listdir(plugin_m4_dir):
+      if os.path.splitext(m4_file)[-1] == '.m4':
+        plugin_m4_files.append(os.path.join(plugin['rel_path'], m4_file))
+  plugin_ac.write("""
+dnl Config for %(title)s
+""" % plugin)
+  for m4_file in plugin_m4_files:
+    plugin_ac.write('m4_sinclude([%s])\n' % m4_file)
+  plugin['plugin_dep_libs']=" ".join(["\${top_builddir}/%s" % f for f in plugin['libs'].split()])
+
+  plugin_ac.write("""
+AC_ARG_WITH([%(name_with_dashes)s-plugin],[
+dnl indented wierd to make the help output correct
+AS_HELP_STRING([--with-%(name_with_dashes)s-plugin],[Build %(title)s. @<:@default=%(enabled)s@:>@])
+AS_HELP_STRING([--without-%(name_with_dashes)s-plugin],[Disable building %(title)s])
+  ],[
+    with_%(name)s_plugin="$withval"
+    AS_IF([test "x$with_%(name)s_plugin" = "xyes"],[
+      requested_%(name)s_plugin="yes"
+    ],[
+      requested_%(name)s_plugin="no"
+    ])
+  ],[
+    with_%(name)s_plugin="%(enabled)s"
+    requested_%(name)s_plugin="no"
+  ])
+AC_ARG_ENABLE([%(name_with_dashes)s-plugin],[
+dnl indented wierd to make the help output correct
+AS_HELP_STRING([--enable-%(name_with_dashes)s-plugin],[Build %(title)s. @<:@default=%(default_yesno)s@:>@])
+AS_HELP_STRING([--disable-%(name_with_dashes)s-plugin],[Disable building %(title)s])
+  ],
+  [enable_%(name)s_plugin="$enableval"],
+  [enable_%(name)s_plugin=%(default_yesno)s])
+
+""" % plugin)
+  if os.path.exists(plugin_ac_file):
+    plugin_ac.write('m4_sinclude([%s])\n' % plugin_ac_file)
+  # The plugin author has specified some check to make to determine
+  # if the plugin can be built. If the plugin is turned on and this
+  # check fails, then configure should error out. If the plugin is not
+  # turned on, then the normal conditional build stuff should just let
+  # it silently not build
+  if plugin['has_build_conditional']:
+    plugin_ac.write("""
+AS_IF([test %(build_conditional)s],
+      [], dnl build_conditional can only negate
+      [
+        AS_IF([test "x${requested_%(name)s_plugin}" = "xyes"],
+              [AC_MSG_ERROR([Plugin %(name)s was explicitly requested, yet failed build dependency checks. Aborting!])])
+        with_%(name)s_plugin=no
+      ])
+
+""" % plugin)
+  if not plugin['unconditional']:
+    plugin_ac.write("""
+AM_CONDITIONAL([%(build_conditional_tag)s],
+               [test %(build_conditional)s])
+    """ % plugin)
+
+  plugin_ac.write("""
+AS_IF([test "x$with_%(name)s_plugin" = "xyes"],
+    [
+""" % plugin)
+  if plugin['testsuite']:
+    plugin_ac.write("""
+      pandora_plugin_test_list="%(name)s,${pandora_plugin_test_list}"
+    """ % plugin)
+  if plugin['static']:
+    plugin_ac.write("""
+        AS_IF([test "x$enable_%(name)s_plugin" = "xyes"],[
+          pandora_builtin_list="%(module_name)s,${pandora_builtin_list}"
+          pandora_builtin_symbols_list="_drizzled_%(module_name)s_plugin_,${pandora_builtin_symbols_list}"
+          pandora_plugin_libs="${pandora_plugin_libs} \${top_builddir}/%(root_plugin_dir)s/%(libname)s.la"
+          PANDORA_PLUGIN_DEP_LIBS="${PANDORA_PLUGIN_DEP_LIBS} %(plugin_dep_libs)s"
+        ])
+    """ % plugin)
+
+  else:
+    plugin_ac.write("""
+        AS_IF([test "x$enable_%(name)s_plugin" = "xyes"],[
+          pandora_default_plugin_list="%(name)s,${pandora_default_plugin_list}"
+        ])
+    """ % plugin)
+  plugin_ac.write("      ])\n")
+
+def fix_file_paths(plugin, files):
+  # TODO: determine path to plugin dir relative to top_srcdir... append it to
+  # source files if they don't already have it
+  new_files=""
+  if plugin['plugin_dir'] != ".":
+    for file in files.split():
+      if not file.startswith(plugin['rel_path']):
+        file= os.path.join(plugin['rel_path'], file)
+        new_files= "%s %s" % (new_files, file)
+  else:
+    new_files= " ".join(plugin['sources'].split())
+  if new_files != "":
+    return new_files
+  return files
+
+def expand_plugin_ini(plugin):
+    if plugin['name'] == "**OUT-OF-TREE**":
+      print "Out of tree plugins require the name field to be specified in plugin.ini"
+      sys.exit(1)
+
+    if plugin['plugin_dir'] == ".":
+      plugin['rel_path']= plugin['plugin_dir']
+      plugin['unconditional']=True
+    else:
+      plugin['rel_path']= plugin['plugin_dir'][len(config['top_srcdir'])+len(os.path.sep):]
+      plugin['unconditional']=False
+
+    plugin['sources']= fix_file_paths(plugin, plugin['sources'])
+    plugin['main_source']= plugin['sources'].split()[0]
+    plugin['headers']= fix_file_paths(plugin, plugin['headers'])
+    plugin['install_headers']= fix_file_paths(plugin, plugin['install_headers'])
+    plugin['tests']= fix_file_paths(plugin, plugin['tests'])
+
+    # Make a yes/no version for autoconf help messages
+    if plugin['load_by_default'] or plugin['static']:
+      plugin['default_yesno']="yes"
+    else:
+      plugin['default_yesno']="no"
+
+
+    plugin['build_conditional_tag']= "BUILD_%s_PLUGIN" % plugin['name'].upper()
+    plugin['name_with_dashes']= plugin['name'].replace('_','-')
+    if plugin.has_key('build_conditional'):
+      plugin['has_build_conditional']=True
+      plugin['build_conditional']='"x${with_%(name)s_plugin}" = "xyes" -a %(build_conditional)s' % plugin
+    else:
+      plugin['has_build_conditional']=False
+      plugin['build_conditional']='"x${with_%(name)s_plugin}" = "xyes"' %plugin
+
+    if plugin['install']:
+      plugin['library_type']= 'pkgplugin'
+    else:
+      plugin['library_type']= 'noinst'
+
+def find_testsuite(plugin_dir):
+  for testdir in ['drizzle-tests','tests']:
+    if os.path.isdir(os.path.join(plugin_dir,testdir)):
+      return testdir
+  if os.path.isdir(os.path.join('tests','suite',os.path.basename(plugin_dir))):
+    return ""
+  return None
+
+def read_plugin_ini(plugin_dir):
+    if plugin_dir == ".":
+      plugin_name="**OUT-OF-TREE**"
+    else:
+      short_name=os.path.basename(plugin_dir)
+      plugin_name = plugin_dir[plugin_dir.index(config['root_plugin_dir']) + len(config['root_plugin_dir']) + 1:]
+      module_name = plugin_name.replace("/", config['module_name_separator']).replace("\\", config['module_name_separator'])
+      plugin_name = plugin_name.replace("/", config['plugin_name_separator']).replace("\\", config['plugin_name_separator'])
+
+
+    plugin_file= os.path.join(plugin_dir,config['plugin_ini_fname'])
+    plugin_defaults= dict(sources="%s.cc" % short_name,
+                          headers="",
+                          install_headers="",
+                          cflags="",
+                          cppflags="",
+                          cxxflags="",
+                          libs="",
+                          ldflags="",
+                          author="",
+                          title="",
+                          description="",
+                          license="PLUGIN_LICENSE_GPL",
+                          name=plugin_name,
+                          module_name=module_name,
+                          load_by_default=config['default_load_by_default'],
+                          disabled="False",
+                          static="False",
+                          dependencies="",
+                          dependency_aliases="",
+                          tests="",
+                          install=config['default_install'])
+    parser=ConfigParser.ConfigParser(defaults= plugin_defaults)
+    parser.read(plugin_file)
+    plugin=dict(parser.items('plugin'))
+    plugin['plugin_dir'] = plugin_dir
+    if plugin_dir == '.':
+      if not plugin.has_key('url'):
+        print "External Plugins are required to specifiy a url"
+        plugin['url']= 'http://launchpad.net/%(name)s' % plugin
+        sys.exit(1)
+      if plugin_dir == '.' and not plugin.has_key('version'):
+        print "External Plugins are required to specifiy a version"
+        sys.exit(1)
+    if not plugin.has_key('version'):
+      plugin['version'] = config['default_plugin_version']
+
+    if plugin.has_key('load_by_default'):
+      plugin['load_by_default']=parser.getboolean('plugin','load_by_default')
+    if plugin.has_key('disabled'):
+      plugin['disabled']=parser.getboolean('plugin','disabled')
+    if plugin['disabled']:
+      plugin['enabled']="no"
+    else:
+      plugin['enabled']="yes"
+    if plugin.has_key('static'):
+      plugin['static']= parser.getboolean('plugin','static')
+    if plugin.has_key('install'):
+      plugin['install']= parser.getboolean('plugin','install')
+    if plugin.has_key('testsuite'):
+      if plugin['testsuite'] == 'disable':
+        plugin['testsuite']= False
+    else:
+      plugin_testsuite= find_testsuite(plugin_dir)
+      plugin['testsuitedir']=plugin_testsuite
+      if plugin_testsuite is not None:
+        plugin['testsuite']=True
+      else:
+        plugin['testsuite']=False
+
+    plugin['cflags']+= ' ' + config['extra_cflags']
+    plugin['cppflags']+= ' ' + config['extra_cppflags']
+    plugin['cxxflags']+= ' ' + config['extra_cxxflags']
+
+    plugin['libname']= "lib%s%s%s" % (config['plugin_prefix'],
+                                      plugin['name'],
+                                      config['plugin_suffix'])
+    if config['force_lowercase_libname']:
+      plugin['libname']= plugin['libname'].lower()
+
+    plugin['root_plugin_dir']= config['root_plugin_dir']
+    plugin['plugin_prefix']= config['plugin_prefix']
+    plugin['plugin_suffix']= config['plugin_suffix']
+    plugin['pkgplugindir']= config['pkgplugindir']
+
+    # Dependencies must have a module but dependency aliases are simply added
+    # to the variable passed during compile.
+    plugin['dependency_list'] = plugin['dependencies'].split()
+    dependency_aliases = plugin['dependency_aliases'].split()
+    plugin['dependencies'] = ','.join(plugin['dependency_list'] +
+                                      plugin['dependency_aliases'].split())
+    dependency_libs = ["%s/lib%s%s.la" % (config['root_plugin_dir'],
+                                          dependency.lower().replace('::', '_'),
+                                          config['plugin_suffix'])
+                       for dependency in plugin['dependency_list']]
+    plugin['libs'] = " ".join(plugin['libs'].split() + dependency_libs);
+
+# Libtool is going to expand:
+#      -DPANDORA_MODULE_AUTHOR='"Padraig O'"'"'Sullivan"'
+# to:
+# "-DPANDORA_MODULE_AUTHOR=\"Padraig O'Sullivan\""
+# So we have to replace internal ''s to '"'"'
+    for key in ('author','title','description','version'):
+      plugin[key]=plugin[key].replace('"','\\"')
+      plugin[key]=plugin[key].replace("'","'\"'\"'")
+    return plugin
+
+
+def write_plugin_am(plugin, plugin_am):
+  """Write an automake fragment for this plugin.
+
+  :param plugin: The plugin dict.
+  :param plugin_am: The file to write to.
+  """
+  # The .plugin.ini.stamp avoids changing the datestamp on plugin.ini which can
+  # confuse VCS systems.
+  plugin_am.write("""
+EXTRA_DIST += %(rel_path)s/plugin.ini
+
+# Prevent errors when a plugin dir is removed
+%(rel_path)s/plugin.ini:
+
+""" % plugin)
+  if plugin['headers'] != "":
+    plugin_am.write("noinst_HEADERS += %(headers)s\n" % plugin)
+  if plugin['install_headers'] != "":
+    plugin_am.write("nobase_include_HEADERS += %(install_headers)s\n" % plugin)
+  if plugin['testsuite']:
+    if plugin.has_key('testsuitedir') and plugin['testsuitedir'] != "":
+      plugin_am.write("EXTRA_DIST += %(rel_path)s/%(testsuitedir)s\n" % plugin)
+  if plugin['static']:
+    plugin_am.write("""
+%(root_plugin_dir)s_%(plugin_prefix)s%(name)s_dir=${top_srcdir}/%(rel_path)s
+EXTRA_DIST += %(rel_path)s/plugin.ini
+if %(build_conditional_tag)s
+  noinst_LTLIBRARIES+=%(root_plugin_dir)s/%(libname)s.la
+  %(root_plugin_dir)s_%(libname)s_la_LIBADD=%(libs)s
+  %(root_plugin_dir)s_%(libname)s_la_DEPENDENCIES=%(libs)s
+  %(root_plugin_dir)s_%(libname)s_la_LDFLAGS=$(AM_LDFLAGS) %(ldflags)s $(GCOV_LIBS)
+  %(root_plugin_dir)s_%(libname)s_la_CPPFLAGS=$(AM_CPPFLAGS) -DPANDORA_MODULE_NAME=%(module_name)s -DPANDORA_MODULE_AUTHOR='"%(author)s"' -DPANDORA_MODULE_TITLE='"%(title)s"' -DPANDORA_MODULE_VERSION='"%(version)s"' -DPANDORA_MODULE_LICENSE=%(license)s -DPANDORA_MODULE_DEPENDENCIES='"%(dependencies)s"' %(cppflags)s
+  %(root_plugin_dir)s_%(libname)s_la_CXXFLAGS=$(AM_CXXFLAGS) %(cxxflags)s
+  %(root_plugin_dir)s_%(libname)s_la_CFLAGS=$(AM_CFLAGS) %(cflags)s
+  %(root_plugin_dir)s_%(libname)s_la_SOURCES=%(sources)s
+  check_PROGRAMS += %(tests)s
+  PANDORA_DYNAMIC_LDADDS+=${top_builddir}/%(root_plugin_dir)s/%(libname)s.la
+endif
+""" % plugin)
+  else:
+    plugin_am.write("""
+%(root_plugin_dir)s_%(plugin_prefix)s%(name)s_dir=${top_srcdir}/%(rel_path)s
+EXTRA_DIST += %(rel_path)s/plugin.ini
+if %(build_conditional_tag)s
+  %(library_type)s_LTLIBRARIES+=%(root_plugin_dir)s/%(libname)s.la
+  %(root_plugin_dir)s_%(libname)s_la_LDFLAGS=-avoid-version -rpath $(pkgplugindir) $(AM_LDFLAGS) %(ldflags)s $(GCOV_LIBS)
+  %(root_plugin_dir)s_%(libname)s_la_LIBADD=%(libs)s
+  %(root_plugin_dir)s_%(libname)s_la_DEPENDENCIES=%(libs)s
+  %(root_plugin_dir)s_%(libname)s_la_CPPFLAGS=$(AM_CPPFLAGS) -DPANDORA_DYNAMIC_PLUGIN -DPANDORA_MODULE_NAME=%(module_name)s -DPANDORA_MODULE_AUTHOR='"%(author)s"' -DPANDORA_MODULE_TITLE='"%(title)s"' -DPANDORA_MODULE_VERSION='"%(version)s"' -DPANDORA_MODULE_LICENSE=%(license)s -DPANDORA_MODULE_DEPENDENCIES='"%(dependencies)s"' %(cppflags)s
+  %(root_plugin_dir)s_%(libname)s_la_CXXFLAGS=$(AM_CXXFLAGS) %(cxxflags)s
+  %(root_plugin_dir)s_%(libname)s_la_CFLAGS=$(AM_CFLAGS) %(cflags)s
+  %(root_plugin_dir)s_%(libname)s_la_SOURCES=%(sources)s
+  check_PROGRAMS += %(tests)s
+endif
+""" % plugin)
+  plugin_am_file=os.path.join(plugin['rel_path'],'plugin.am')
+  if os.path.exists(plugin_am_file):
+    plugin_am.write('include %s\n' % plugin_am_file)
+
+#
+# MAIN STARTS HERE:
+#
+
+# Parse the pandora-plugin config file
+
+config_defaults= dict(
+  top_srcdir='.',
+  top_builddir='.',
+  plugin_ini_fname='plugin.ini',
+  plugin_prefix='',
+  plugin_suffix='',
+  extra_cflags='',
+  extra_cppflags='',
+  extra_cxxflags='',
+  root_plugin_dir='',
+  pkgplugindir='',
+  default_install='True',
+  default_plugin_version='',
+  default_load_by_default='False',
+  force_lowercase_libname='True',
+  plugin_name_separator='_',
+  module_name_separator='::'
+)
+
+config_parser = ConfigParser.ConfigParser(defaults=config_defaults)
+config_parser.read(pandora_plugin_file)
+config = dict(config_parser.items('pandora-plugin'))
+config['force_lowercase_libname']=config_parser.getboolean('pandora-plugin','force_lowercase_libname')
+
+# I'm 3 seconds away from writing a comprehensive build solution
+if not os.path.exists('config/pandora_vc_revinfo'):
+  if os.path.exists('.bzr'):
+    bzr_revno= subprocess.Popen(["bzr", "revno"], stdout=subprocess.PIPE).communicate()[0].strip()
+    rev_date= datetime.date.fromtimestamp(time.time())
+    config['default_plugin_version'] = "%d.%02d.%s" % (rev_date.year, rev_date.month, bzr_revno)
+  else:
+    config['default_plugin_version']=datetime.date.fromtimestamp(time.time()).isoformat()
+else:
+  # need to read config/pandora_vc_revno
+  pandora_vc_revno=open('config/pandora_vc_revinfo','r').read().split()
+  rev_date=""
+  bzr_revno=""
+  for revno_line in pandora_vc_revno:
+    (revno_key,revno_val)= revno_line.split("=")
+    if revno_key == 'PANDORA_VC_REVNO':
+      bzr_revno=revno_val.strip()
+    elif revno_key == 'PANDORA_RELEASE_DATE':
+      rev_date=revno_val.strip()
+
+  config['default_plugin_version'] = "%s.%s" % (rev_date, bzr_revno)
+
+actions=[]
+for arg in sys.argv:
+  if arg.startswith('--top_srcdir='):
+    config['top_srcdir']=arg[12:]
+  elif arg.startswith('--top_builddir='):
+    config['top_builddir']=arg[14:]
+  elif arg == "--force-all":
+    actions=['plugin-list','pandora-plugin.am','write']
+    break
+  else:
+    actions.append(arg)
+if len(actions) == 0:
+  actions.append('write')
+
+plugin_list=[]
+
+def accumulate_plugins(arg, dirname, fnames):
+  # plugin_ini_fname is a name in dirname indicating dirname is a plugin.
+  if config['plugin_ini_fname'] in fnames:
+    arg.append(dirname)
+
+os.path.walk(os.path.join(config['top_srcdir'],
+                          config['root_plugin_dir']),
+             accumulate_plugins,
+             plugin_list)
+
+
+if not os.path.exists("config/pandora-plugin.am") or "write" in actions:
+  plugin_am_file = ChangeProtectedFile(os.path.join('config', 'pandora-plugin.am'))
+  plugin_am_file.write("""
+# always the current list, generated every build so keep this lean.
+# pandora-plugin.list: datestamp preserved list
+${srcdir}/config/pandora-plugin.list: .plugin.scan
+.plugin.scan:
+	@cd ${top_srcdir} && python config/pandora-plugin plugin-list
+
+# Plugins affect configure; so to prevent configure running twice in a tarball
+# build (once up front, once with the right list of plugins, we ship the
+# generated list of plugins and the housekeeping material for that list so it
+# is likewise not updated.
+EXTRA_DIST += \
+	config/pandora-plugin.am \
+	config/pandora-plugin.ac \
+	config/pandora-plugin \
+	config/pandora-plugin.ini
+
+
+# Seed the list of plugin LDADDS which plugins may extend.
+PANDORA_DYNAMIC_LDADDS=
+
+# plugin.stamp: graph dominator for creating all per pandora-plugin.ac/am
+# files. This is invoked when the code to generate such files has altered.""")
+
+if not os.path.exists("config/pandora-plugin.ac") or "write" in actions:
+  plugin_ac_file = ChangeProtectedFile(os.path.join('config', 'pandora-plugin.ac'))
+  plugin_ac_file.write("dnl Generated file, run make to rebuild\n")
+
+
+if os.path.exists('plugin.ini'):
+  # Are we in a plugin dir which wants to have a self-sufficient build system?
+  plugin_list=['.']
+
+  write_external_plugin()
+else:
+  plugin_list_file = ChangeProtectedFile(os.path.join('config', 'pandora-plugin.list'))
+  for p in plugin_list:
+    plugin_list_file.write(p)
+    plugin_list_file.write("\n")
+  plugin_list.sort()
+  plugin_list_file.close()
+
+if not os.path.exists("config/pandora-plugin.am") or 'write' in actions:
+  plugin_am_file.write("\n${top_srcdir}/config/pandora-plugin.am: ${top_srcdir}/config/pandora-plugin.list ${top_srcdir}/config/pandora-plugin ")
+  for plugin_dir in plugin_list:
+    plugin_am_file.write("\\\n\t%s/plugin.ini " % plugin_dir)
+  plugin_am_file.write("\n\tcd ${top_srcdir} && python config/pandora-plugin write\n")
+  plugin_ini_list=[]
+
+  # Load all plugin.ini files first so we can do dependency tracking.
+  for plugin_dir in plugin_list:
+    plugin = read_plugin_ini(plugin_dir)
+    expand_plugin_ini(plugin)
+    plugin_ini_list.append(plugin)
+
+  # Check for duplicates
+  plugin_name_list = [plugin['libname'] for plugin in plugin_ini_list]
+  for plugin in plugin_ini_list:
+    if plugin_name_list.count(plugin['libname']) != 1:
+      print "Duplicate module name %s" % plugin['libname']
+      exit(1)
+
+  for plugin in plugin_ini_list:
+    write_plugin(plugin, plugin_ini_list)
+
+if plugin_am_file is not None:
+  plugin_am_file.close()
+if plugin_ac_file is not None:
+  plugin_ac_file.close()

=== added file 'config/uncrustify.cfg'
--- config/uncrustify.cfg	1970-01-01 00:00:00 +0000
+++ config/uncrustify.cfg	2010-07-01 01:31:26 +0000
@@ -0,0 +1,1112 @@
+#
+# Uncrustify options (with comments) for Pandora Projects
+#
+
+nl_after_brace_close = TRUE
+
+# The type of line endings
+newlines                                 = lf       # auto/lf/crlf/cr
+
+# The original size of tabs in the input
+input_tab_size                           = 8        # number
+
+# The size of tabs in the output (only used if align_with_tabs=true)
+output_tab_size                          = 3        # number
+
+# The ascii value of the string escape char, usually 92 (\) or 94 (^). (Pawn)
+string_escape_char                       = 92       # number
+
+# Alternate string escape char for Pawn. Only works right before the quote char.
+string_escape_char2                      = 0        # number
+
+#
+# Indenting
+#
+
+# The number of columns to indent per level.
+# Usually 2, 3, 4, or 8.
+indent_columns                           = 2        # number
+
+# How to use tabs when indenting code
+# 0=spaces only
+# 1=indent with tabs, align with spaces
+# 2=indent and align with tabs
+indent_with_tabs                         = 0        # number
+
+# Whether to indent strings broken by '\' so that they line up
+indent_align_string                      = true     # false/true
+
+# The number of spaces to indent multi-line XML strings.
+# Requires indent_align_string=True
+indent_xml_string                        = 0        # number
+
+# Spaces to indent '{' from level
+indent_brace                             = 0        # number
+
+# Whether braces are indented to the body level
+indent_braces                            = false    # false/true
+
+# Disabled indenting function braces if indent_braces is true
+indent_braces_no_func                    = false    # false/true
+
+# Indent based on the size of the brace parent, ie 'if' => 3 spaces, 'for' => 4 spaces, etc.
+indent_brace_parent                      = false    # false/true
+
+# Whether the 'namespace' body is indented
+indent_namespace                         = false    # false/true
+
+# Whether the 'extern "C"' body is indented
+indent_extern                            = false    # false/true
+
+# Whether the 'class' body is indented
+indent_class                             = true     # false/true
+
+# Whether to indent the stuff after a leading class colon
+indent_class_colon                       = true     # false/true
+
+# False=treat 'else\nif' as 'else if' for indenting purposes
+# True=indent the 'if' one level
+indent_else_if                           = false    # false/true
+
+# True:  indent continued function call parameters one indent level
+# False: align parameters under the open paren
+indent_func_call_param                   = false    # false/true
+
+# Same as indent_func_call_param, but for function defs
+indent_func_def_param                    = false    # false/true
+
+# Same as indent_func_call_param, but for function protos
+indent_func_proto_param                  = false    # false/true
+
+# Same as indent_func_call_param, but for class declarations
+indent_func_class_param                  = false    # false/true
+
+# Same as indent_func_call_param, but for class variable constructors
+indent_func_ctor_var_param               = false    # false/true
+
+# Same as indent_func_call_param, but for templates
+indent_template_param                    = false    # false/true
+
+# Double the indent for indent_func_xxx_param options
+indent_func_param_double                 = false    # false/true
+
+# Indentation column for standalone 'const' function decl/proto qualifier
+indent_func_const                        = 0        # number
+
+# Indentation column for standalone 'throw' function decl/proto qualifier
+indent_func_throw                        = 0        # number
+
+# The number of spaces to indent a continued '->' or '.'
+# Usually set to 0, 1, or indent_columns.
+indent_member                            = 3        # number
+
+# Spaces to indent single line ('//') comments on lines before code
+indent_sing_line_comments                = 0        # number
+
+# If set, will indent trailing single line ('//') comments relative
+# to the code instead of trying to keep the same absolute column
+indent_relative_single_line_comments     = false    # false/true
+
+# Spaces to indent 'case' from 'switch'
+# Usually 0 or indent_columns.
+indent_switch_case                       = 0        # number
+
+# Spaces to shift the 'case' line, without affecting any other lines
+# Usually 0.
+indent_case_shift                        = 0        # number
+
+# Spaces to indent '{' from 'case'.
+# By default, the brace will appear under the 'c' in case.
+# Usually set to 0 or indent_columns.
+indent_case_brace                        = 0        # number
+
+# Whether to indent comments found in first column
+indent_col1_comment                      = false    # false/true
+
+# How to indent goto labels
+#  >0 : absolute column where 1 is the leftmost column
+#  <=0 : subtract from brace indent
+indent_label                             = 1        # number
+
+# Same as indent_label, but for access specifiers that are followed by a colon
+indent_access_spec                       = 1        # number
+
+# Indent the code after an access specifier by one level.
+# If set, this option forces 'indent_access_spec=0'
+indent_access_spec_body                  = false    # false/true
+
+# If an open paren is followed by a newline, indent the next line so that it lines up after the open paren (not recommended)
+indent_paren_nl                          = false    # false/true
+
+# Controls the indent of a close paren after a newline.
+# 0: Indent to body level
+# 1: Align under the open paren
+# 2: Indent to the brace level
+indent_paren_close                       = 0        # number
+
+# Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren
+indent_comma_paren                       = false    # false/true
+
+# Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren
+indent_bool_paren                        = false    # false/true
+
+# If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended)
+indent_square_nl                         = false    # false/true
+
+# Don't change the relative indent of ESQL/C 'EXEC SQL' bodies
+indent_preserve_sql                      = false    # false/true
+
+#
+# Spacing options
+#
+
+# Add or remove space around arithmetic operator '+', '-', '/', '*', etc
+sp_arith                                 = force    # ignore/add/remove/force
+
+# Add or remove space before assignment operator '=', '+=', etc
+sp_before_assign                         = remove    # ignore/add/remove/force
+
+# Add or remove space after assignment operator '=', '+=', etc
+sp_after_assign                         = force    # ignore/add/remove/force
+
+# Add or remove space around assignment '=' in enum
+sp_enum_assign                           = ignore   # ignore/add/remove/force
+
+# Add or remove space around boolean operators '&&' and '||'
+sp_bool                                  = force    # ignore/add/remove/force
+
+# Add or remove space around compare operator '<', '>', '==', etc
+sp_compare                               = force    # ignore/add/remove/force
+
+# Add or remove space inside '(' and ')'
+sp_inside_paren                          = remove   # ignore/add/remove/force
+
+# Add or remove space between nested parens
+sp_paren_paren                           = remove   # ignore/add/remove/force
+
+# Whether to balance spaces inside nested parens
+sp_balance_nested_parens                 = false    # false/true
+
+# Add or remove space between ')' and '{'
+sp_paren_brace                           = ignore   # ignore/add/remove/force
+
+# Add or remove space before pointer star '*'
+sp_before_ptr_star                       = force    # ignore/add/remove/force
+
+# Add or remove space before pointer star '*' that isn't followed by a variable name
+# If set to 'ignore', sp_before_ptr_star is used instead.
+sp_before_unnamed_ptr_star               = ignore   # ignore/add/remove/force
+
+# Add or remove space between pointer stars '*'
+sp_between_ptr_star                      = remove   # ignore/add/remove/force
+
+# Add or remove space after pointer star '*', if followed by a word.
+sp_after_ptr_star                        = remove   # ignore/add/remove/force
+
+# Add or remove space after a pointer star '*', if followed by a func proto/def.
+sp_after_ptr_star_func                   = ignore   # ignore/add/remove/force
+
+# Add or remove space before a pointer star '*', if followed by a func proto/def.
+sp_before_ptr_star_func                  = ignore   # ignore/add/remove/force
+
+# Add or remove space before a reference sign '&'
+sp_before_byref                          = remove   # ignore/add/remove/force
+
+# Add or remove space before a reference sign '&' that isn't followed by a variable name
+# If set to 'ignore', sp_before_byref is used instead.
+sp_before_unnamed_byref                  = ignore   # ignore/add/remove/force
+
+# Add or remove space after reference sign '&', if followed by a word.
+sp_after_byref                           = force    # ignore/add/remove/force
+
+# Add or remove space after a reference sign '&', if followed by a func proto/def.
+sp_after_byref_func                      = ignore   # ignore/add/remove/force
+
+# Add or remove space before a reference sign '&', if followed by a func proto/def.
+sp_before_byref_func                     = ignore   # ignore/add/remove/force
+
+# Add or remove space between type and word
+sp_after_type                            = force    # ignore/add/remove/force
+
+# Add or remove space in 'template <' vs 'template<'.
+# If set to ignore, sp_before_angle is used.
+sp_template_angle                        = ignore   # ignore/add/remove/force
+
+# Add or remove space before '<>'
+sp_before_angle                          = remove   # ignore/add/remove/force
+
+# Add or remove space inside '<' and '>'
+sp_inside_angle                          = remove   # ignore/add/remove/force
+
+# Add or remove space after '<>'
+sp_after_angle                           = force    # ignore/add/remove/force
+
+# Add or remove space between '<>' and '(' as found in 'new List<byte>();'
+sp_angle_paren                           = ignore   # ignore/add/remove/force
+
+# Add or remove space between '<>' and a word as in 'List<byte> m;'
+sp_angle_word                            = ignore   # ignore/add/remove/force
+
+# Add or remove space before '(' of 'if', 'for', 'switch', and 'while'
+sp_before_sparen                         = force    # ignore/add/remove/force
+
+# Add or remove space inside if-condition '(' and ')'
+sp_inside_sparen                         = remove   # ignore/add/remove/force
+
+# Add or remove space after ')' of 'if', 'for', 'switch', and 'while'
+sp_after_sparen                          = force    # ignore/add/remove/force
+
+# Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while'
+sp_sparen_brace                          = add      # ignore/add/remove/force
+
+# Add or remove space before empty statement ';' on 'if', 'for' and 'while'
+sp_special_semi                          = ignore   # ignore/add/remove/force
+
+# Add or remove space before ';'
+sp_before_semi                           = remove   # ignore/add/remove/force
+
+# Add or remove space before ';' in non-empty 'for' statements
+sp_before_semi_for                       = ignore   # ignore/add/remove/force
+
+# Add or remove space before a semicolon of an empty part of a for statment.
+sp_before_semi_for_empty                 = force    # ignore/add/remove/force
+
+# Add or remove space after the final semicolon of an empty part of a for statment: for ( ; ; <here> ).
+sp_after_semi_for_empty                  = ignore   # ignore/add/remove/force
+
+# Add or remove space before '[' (except '[]')
+sp_before_square                         = ignore   # ignore/add/remove/force
+
+# Add or remove space before '[]'
+sp_before_squares                        = ignore   # ignore/add/remove/force
+
+# Add or remove space inside '[' and ']'
+sp_inside_square                         = remove   # ignore/add/remove/force
+
+# Add or remove space after ','
+sp_after_comma                           = force    # ignore/add/remove/force
+
+# Add or remove space before ','
+sp_before_comma                          = remove   # ignore/add/remove/force
+
+# Add or remove space after class ':'
+sp_after_class_colon                     = ignore   # ignore/add/remove/force
+
+# Add or remove space before class ':'
+sp_before_class_colon                    = ignore   # ignore/add/remove/force
+
+# Add or remove space between 'operator' and operator sign
+sp_after_operator                        = ignore   # ignore/add/remove/force
+
+# Add or remove space between the operator symbol and the open paren, as in 'operator ++('
+sp_after_operator_sym                    = ignore   # ignore/add/remove/force
+
+# Add or remove space after C/D cast, ie 'cast(int)a' vs 'cast(int) a' or '(int)a' vs '(int) a'
+sp_after_cast                            = remove   # ignore/add/remove/force
+
+# Add or remove spaces inside cast parens
+sp_inside_paren_cast                     = remove   # ignore/add/remove/force
+
+# Add or remove space between the type and open paren in a C++ cast, ie 'int(exp)' vs 'int (exp)'
+sp_cpp_cast_paren                        = remove   # ignore/add/remove/force
+
+# Add or remove space between 'sizeof' and '('
+sp_sizeof_paren                          = remove   # ignore/add/remove/force
+
+# Add or remove space after the tag keyword (Pawn)
+sp_after_tag                             = ignore   # ignore/add/remove/force
+
+# Add or remove space inside enum '{' and '}'
+sp_inside_braces_enum                    = force    # ignore/add/remove/force
+
+# Add or remove space inside struct/union '{' and '}'
+sp_inside_braces_struct                  = force    # ignore/add/remove/force
+
+# Add or remove space inside '{' and '}'
+sp_inside_braces                         = force    # ignore/add/remove/force
+
+# Add or remove space inside '{}'
+sp_inside_braces_empty                   = ignore   # ignore/add/remove/force
+
+# Add or remove space between return type and function name
+# A minimum of 1 is forced except for pointer return types.
+sp_type_func                             = force    # ignore/add/remove/force
+
+# Add or remove space between function name and '(' on function declaration
+sp_func_proto_paren                      = remove   # ignore/add/remove/force
+
+# Add or remove space between function name and '(' on function definition
+sp_func_def_paren                        = remove   # ignore/add/remove/force
+
+# Add or remove space inside empty function '()'
+sp_inside_fparens                        = ignore   # ignore/add/remove/force
+
+# Add or remove space inside function '(' and ')'
+sp_inside_fparen                         = remove   # ignore/add/remove/force
+
+# Add or remove space between ']' and '(' when part of a function call.
+sp_square_fparen                         = ignore   # ignore/add/remove/force
+
+# Add or remove space between ')' and '{' of function
+sp_fparen_brace                          = add      # ignore/add/remove/force
+
+# Add or remove space between function name and '(' on function calls
+sp_func_call_paren                       = remove   # ignore/add/remove/force
+
+# Add or remove space between the user function name and '(' on function calls
+# You need to set a keyword to be a user function, like this: 'set func_call_user _' in the config file.
+sp_func_call_user_paren                  = ignore   # ignore/add/remove/force
+
+# Add or remove space between a constructor/destructor and the open paren
+sp_func_class_paren                      = remove   # ignore/add/remove/force
+
+# Add or remove space between 'return' and '('
+sp_return_paren                          = remove   # ignore/add/remove/force
+
+# Add or remove space between '__attribute__' and '('
+sp_attribute_paren                       = remove   # ignore/add/remove/force
+
+# Add or remove space between 'defined' and '(' in '#if defined (FOO)'
+sp_defined_paren                         = remove   # ignore/add/remove/force
+
+# Add or remove space between 'throw' and '(' in 'throw (something)'
+sp_throw_paren                           = ignore   # ignore/add/remove/force
+
+# Add or remove space between macro and value
+sp_macro                                 = ignore   # ignore/add/remove/force
+
+# Add or remove space between macro function ')' and value
+sp_macro_func                            = ignore   # ignore/add/remove/force
+
+# Add or remove space between 'else' and '{' if on the same line
+sp_else_brace                            = ignore   # ignore/add/remove/force
+
+# Add or remove space between '}' and 'else' if on the same line
+sp_brace_else                            = ignore   # ignore/add/remove/force
+
+# Add or remove space between '}' and the name of a typedef on the same line
+sp_brace_typedef                         = force    # ignore/add/remove/force
+
+# Add or remove space between 'catch' and '{' if on the same line
+sp_catch_brace                           = ignore   # ignore/add/remove/force
+
+# Add or remove space between '}' and 'catch' if on the same line
+sp_brace_catch                           = ignore   # ignore/add/remove/force
+
+# Add or remove space between 'finally' and '{' if on the same line
+sp_finally_brace                         = ignore   # ignore/add/remove/force
+
+# Add or remove space between '}' and 'finally' if on the same line
+sp_brace_finally                         = ignore   # ignore/add/remove/force
+
+# Add or remove space between 'try' and '{' if on the same line
+sp_try_brace                             = ignore   # ignore/add/remove/force
+
+# Add or remove space between get/set and '{' if on the same line
+sp_getset_brace                          = ignore   # ignore/add/remove/force
+
+# Add or remove space before the '::' operator
+sp_before_dc                             = remove   # ignore/add/remove/force
+
+# Add or remove space after the '::' operator
+sp_after_dc                              = remove   # ignore/add/remove/force
+
+# Add or remove around the D named array initializer ':' operator
+sp_d_array_colon                         = ignore   # ignore/add/remove/force
+
+# Add or remove space after the '!' (not) operator.
+sp_not                                   = force   # ignore/add/remove/force
+
+# Add or remove space after the '~' (invert) operator.
+sp_inv                                   = remove   # ignore/add/remove/force
+
+# Add or remove space after the '&' (address-of) operator.
+# This does not affect the spacing after a '&' that is part of a type.
+sp_addr                                  = remove   # ignore/add/remove/force
+
+# Add or remove space around the '.' or '->' operators
+sp_member                                = remove   # ignore/add/remove/force
+
+# Add or remove space after the '*' (dereference) operator.
+# This does not affect the spacing after a '*' that is part of a type.
+sp_deref                                 = remove   # ignore/add/remove/force
+
+# Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'
+sp_sign                                  = remove   # ignore/add/remove/force
+
+# Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;'
+sp_incdec                                = remove   # ignore/add/remove/force
+
+# Add or remove space before a backslash-newline at the end of a line
+sp_before_nl_cont                        = add      # ignore/add/remove/force
+
+# Add or remove space after the scope '+' or '-', as in '-(void) foo;' or '+(int) bar;'
+sp_after_oc_scope                        = ignore   # ignore/add/remove/force
+
+# Add or remove space after the colon in message specs
+# '-(int) f:(int) x;' vs '-(int) f: (int) x;'
+sp_after_oc_colon                        = ignore   # ignore/add/remove/force
+
+# Add or remove space before the colon in message specs
+# '-(int) f: (int) x;' vs '-(int) f : (int) x;'
+sp_before_oc_colon                       = ignore   # ignore/add/remove/force
+
+# Add or remove space after the colon in message specs
+# '[object setValue:1];' vs '[object setValue: 1];'
+sp_after_send_oc_colon                   = ignore   # ignore/add/remove/force
+
+# Add or remove space before the colon in message specs
+# '[object setValue:1];' vs '[object setValue :1];'
+sp_before_send_oc_colon                  = ignore   # ignore/add/remove/force
+
+# Add or remove space after the (type) in message specs
+# '-(int) f: (int) x;' vs '-(int) f: (int)x;'
+sp_after_oc_type                         = ignore   # ignore/add/remove/force
+
+# Add or remove space around the ':' in 'b ? t : f'
+sp_cond_colon                            = ignore   # ignore/add/remove/force
+
+# Add or remove space around the '?' in 'b ? t : f'
+sp_cond_question                         = ignore   # ignore/add/remove/force
+
+# Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make sense here.
+sp_case_label                            = remove   # ignore/add/remove/force
+
+#
+# Code alignment (not left column spaces/tabs)
+#
+
+# Whether to keep non-indenting tabs
+align_keep_tabs                          = false    # false/true
+
+# Whether to use tabs for alinging
+align_with_tabs                          = false    # false/true
+
+# Whether to bump out to the next tab when aligning
+align_on_tabstop                         = false    # false/true
+
+# Whether to left-align numbers
+align_number_left                        = false     # false/true
+
+# Align variable definitions in prototypes and functions
+align_func_params                        = false     # false/true
+
+# Align parameters in single-line functions that have the same name.
+# The function names must already be aligned with each other.
+align_same_func_call_params              = false    # false/true
+
+# The span for aligning variable definitions (0=don't align)
+align_var_def_span                       = 1        # number
+
+# How to align the star in variable definitions.
+#  0=Part of the type     'void *   foo;'
+#  1=Part of the variable 'void     *foo;'
+#  2=Dangling             'void    *foo;'
+align_var_def_star_style                 = 1        # number
+
+# How to align the '&' in variable definitions.
+#  0=Part of the type
+#  1=Part of the variable
+#  2=Dangling
+align_var_def_amp_style                  = 0        # number
+
+# The threshold for aligning variable definitions (0=no limit)
+align_var_def_thresh                     = 1       # number
+
+# The gap for aligning variable definitions
+align_var_def_gap                        = 0        # number
+
+# Whether to align the colon in struct bit fields
+align_var_def_colon                      = false     # false/true
+
+# Whether to align inline struct/enum/union variable definitions
+align_var_def_inline                     = false     # false/true
+
+# The span for aligning on '=' in assignments (0=don't align)
+align_assign_span                        = 0        # number
+
+# The threshold for aligning on '=' in assignments (0=no limit)
+align_assign_thresh                      = 12       # number
+
+# The span for aligning on '=' in enums (0=don't align)
+align_enum_equ_span                      = 0       # number
+
+# The threshold for aligning on '=' in enums (0=no limit)
+align_enum_equ_thresh                    = 0        # number
+
+# The span for aligning struct/union (0=don't align)
+align_var_struct_span                    = 0       # number
+
+# The threshold for aligning struct/union member definitions (0=no limit)
+align_var_struct_thresh                  = 0        # number
+
+# The gap for aligning struct/union member definitions
+align_var_struct_gap                     = 0        # number
+
+# The span for aligning struct initializer values (0=don't align)
+align_struct_init_span                   = 3        # number
+
+# The minimum space between the type and the synonym of a typedef
+align_typedef_gap                        = 3        # number
+
+# The span for aligning single-line typedefs (0=don't align)
+align_typedef_span                       = 5        # number
+
+# How to align typedef'd functions with other typedefs
+# 0: Don't mix them at all
+# 1: align the open paren with the types
+# 2: align the function type name with the other type names
+align_typedef_func                       = 0        # number
+
+# Controls the positioning of the '*' in typedefs. Just try it.
+# 0: Align on typdef type, ignore '*'
+# 1: The '*' is part of type name: typedef int  *pint;
+# 2: The '*' is part of the type, but dangling: typedef int *pint;
+align_typedef_star_style                 = 0        # number
+
+# Controls the positioning of the '&' in typedefs. Just try it.
+# 0: Align on typdef type, ignore '&'
+# 1: The '&' is part of type name: typedef int  &pint;
+# 2: The '&' is part of the type, but dangling: typedef int &pint;
+align_typedef_amp_style                  = 0        # number
+
+# The span for aligning comments that end lines (0=don't align)
+align_right_cmt_span                     = 3        # number
+
+# If aligning comments, mix with comments after '}' and #endif with less than 3 spaces before the comment
+align_right_cmt_mix                      = false    # false/true
+
+# If a trailing comment is more than this number of columns away from the text it follows,
+# it will qualify for being aligned.
+align_right_cmt_gap                      = 0        # number
+
+# The span for aligning function prototypes (0=don't align)
+align_func_proto_span                    = 0        # number
+
+# Minimum gap between the return type and the function name.
+align_func_proto_gap                     = 0        # number
+
+# Whether to mix aligning prototype and variable declarations.
+# If true, align_var_def_XXX options are used instead of align_func_proto_XXX options.
+align_mix_var_proto                      = false    # false/true
+
+# Align single-line functions with function prototypes, uses align_func_proto_span
+align_single_line_func                   = false    # false/true
+
+# Aligning the open brace of single-line functions.
+# Requires align_single_line_func=true, uses align_func_proto_span
+align_single_line_brace                  = false    # false/true
+
+# Gap for align_single_line_brace.
+align_single_line_brace_gap              = 0        # number
+
+# The span for aligning ObjC msg spec (0=don't align)
+align_oc_msg_spec_span                   = 0        # number
+
+# Whether to align macros wrapped with a backslash and a newline.
+# This will not work right if the macro contains a multi-line comment.
+align_nl_cont                            = true     # false/true
+
+# The minimum space between label and value of a preprocessor define
+align_pp_define_gap                      = 4        # number
+
+# The span for aligning on '#define' bodies (0=don't align)
+align_pp_define_span                     = 3        # number
+
+# Align lines that start with '<<' with previous '<<'. Default=true
+align_left_shift                         = true     # false/true
+
+#
+# Newline adding and removing options
+#
+
+# Whether to collapse empty blocks between '{' and '}'
+nl_collapse_empty_body                   = true    # false/true
+
+# Don't split one-line braced assignments - 'foo_t f = { 1, 2 };'
+nl_assign_leave_one_liners               = false     # false/true
+
+# Don't split one-line braced statements inside a class xx { } body
+nl_class_leave_one_liners                = false     # false/true
+
+# Don't split one-line enums: 'enum foo { BAR = 15 };'
+nl_enum_leave_one_liners                 = false    # false/true
+
+# Don't split one-line get or set functions
+nl_getset_leave_one_liners               = false    # false/true
+
+# Don't split one-line function definitions - 'int foo() { return 0; }'
+nl_func_leave_one_liners                 = false    # false/true
+
+# Don't split one-line if/else statements - 'if(a) b++;'
+nl_if_leave_one_liners                   = false    # false/true
+
+# Add or remove newlines at the start of the file
+nl_start_of_file                         = remove   # ignore/add/remove/force
+
+# The number of newlines at the start of the file (only used if nl_start_of_file is 'add' or 'force'
+nl_start_of_file_min                     = 0        # number
+
+# Add or remove newline at the end of the file
+nl_end_of_file                           = force    # ignore/add/remove/force
+
+# The number of newlines at the end of the file (only used if nl_end_of_file is 'add' or 'force')
+nl_end_of_file_min                       = 1        # number
+
+# Add or remove newline between '=' and '{'
+nl_assign_brace                          = force      # ignore/add/remove/force
+
+# Add or remove newline between '=' and '[' (D only)
+nl_assign_square                         = force   # ignore/add/remove/force
+
+# Add or remove newline after '= [' (D only). Will also affect the newline before the ']'
+nl_after_square_assign                   = force   # ignore/add/remove/force
+
+# The number of newlines after a block of variable definitions
+nl_func_var_def_blk                      = 1        # number
+
+# Add or remove newline between a function call's ')' and '{', as in:
+# list_for_each(item, &list) { }
+nl_fcall_brace                           = force      # ignore/add/remove/force
+
+# Add or remove newline between 'enum' and '{'
+nl_enum_brace                            = force    # ignore/add/remove/force
+
+# Add or remove newline between 'struct and '{'
+nl_struct_brace                          = force    # ignore/add/remove/force
+
+# Add or remove newline between 'union' and '{'
+nl_union_brace                           = force    # ignore/add/remove/force
+
+# Add or remove newline between 'if' and '{'
+nl_if_brace                              = force      # ignore/add/remove/force
+
+# Add or remove newline between '}' and 'else'
+nl_brace_else                            = force      # ignore/add/remove/force
+
+# Add or remove newline between 'else if' and '{'
+# If set to ignore, nl_if_brace is used instead
+nl_elseif_brace                          = force   # ignore/add/remove/force
+
+# Add or remove newline between 'else' and '{'
+nl_else_brace                            = force      # ignore/add/remove/force
+
+# Add or remove newline between 'else' and 'if'
+nl_else_if                               = remove   # ignore/add/remove/force
+
+# Add or remove newline between '}' and 'finally'
+nl_brace_finally                         = force   # ignore/add/remove/force
+
+# Add or remove newline between 'finally' and '{'
+nl_finally_brace                         = force   # ignore/add/remove/force
+
+# Add or remove newline between 'try' and '{'
+nl_try_brace                             = force   # ignore/add/remove/force
+
+# Add or remove newline between get/set and '{'
+nl_getset_brace                          = force    # ignore/add/remove/force
+
+# Add or remove newline between 'for' and '{'
+nl_for_brace                             = force      # ignore/add/remove/force
+
+# Add or remove newline between 'catch' and '{'
+nl_catch_brace                           = force   # ignore/add/remove/force
+
+# Add or remove newline between '}' and 'catch'
+nl_brace_catch                           = force   # ignore/add/remove/force
+
+# Add or remove newline between 'while' and '{'
+nl_while_brace                           = force      # ignore/add/remove/force
+
+# Add or remove newline between 'do' and '{'
+nl_do_brace                              = force      # ignore/add/remove/force
+
+# Add or remove newline between '}' and 'while' of 'do' statement
+nl_brace_while                           = force   # ignore/add/remove/force
+
+# Add or remove newline between 'switch' and '{'
+nl_switch_brace                          = force      # ignore/add/remove/force
+
+# Add or remove newline when condition spans two or more lines
+nl_multi_line_cond                       = false    # false/true
+
+# Force a newline in a define after the macro name for multi-line defines.
+nl_multi_line_define                     = true     # false/true
+
+# Whether to put a newline before 'case' statement
+nl_before_case                           = true     # false/true
+
+# Add or remove newline between ')' and 'throw'
+nl_before_throw                          = ignore   # ignore/add/remove/force
+
+# Whether to put a newline after 'case' statement
+nl_after_case                            = true     # false/true
+
+# Newline between namespace and {
+nl_namespace_brace                       = add   # ignore/add/remove/force
+
+# Add or remove newline between 'template<>' and whatever follows.
+nl_template_class                        = add   # ignore/add/remove/force
+
+# Add or remove newline between 'class' and '{'
+nl_class_brace                           = add   # ignore/add/remove/force
+
+# Add or remove newline after each ',' in the constructor member initialization
+nl_class_init_args                       = force   # ignore/add/remove/force
+
+# Add or remove newline between return type and function name in definition
+nl_func_type_name                        = ignore   # ignore/add/remove/force
+
+# Add or remove newline between return type and function name in a prototype
+nl_func_proto_type_name                  = remove   # ignore/add/remove/force
+
+# Add or remove newline between a function name and the opening '('
+nl_func_paren                            = remove   # ignore/add/remove/force
+
+# Add or remove newline after '(' in a function declaration
+nl_func_decl_start                       = remove   # ignore/add/remove/force
+
+# Add or remove newline after each ',' in a function declaration
+nl_func_decl_args                        = remove   # ignore/add/remove/force
+
+# Add or remove newline before the ')' in a function declaration
+nl_func_decl_end                         = remove   # ignore/add/remove/force
+
+# Add or remove newline between function signature and '{'
+nl_fdef_brace                            = add      # ignore/add/remove/force
+
+# Whether to put a newline after 'return' statement
+nl_after_return                          = true     # false/true
+
+# Add or remove a newline between the return keyword and return expression.
+nl_return_expr                           = remove   # ignore/add/remove/force
+
+# Whether to put a newline after semicolons, except in 'for' statements
+nl_after_semicolon                       = true     # false/true
+
+# Whether to put a newline after brace open.
+# This also adds a newline before the matching brace close.
+nl_after_brace_open                      = true     # false/true
+
+# If nl_after_brace_open and nl_after_brace_open_cmt are true, a newline is
+# placed between the open brace and a trailing single-line comment.
+nl_after_brace_open_cmt                  = false    # false/true
+
+# Whether to put a newline after a virtual brace open.
+# These occur in un-braced if/while/do/for statement bodies.
+nl_after_vbrace_open                     = true    # false/true
+
+# Whether to alter newlines in '#define' macros
+nl_define_macro                          = true    # false/true
+
+# Whether to not put blanks after '#ifxx', '#elxx', or before '#endif'
+nl_squeeze_ifdef                         = false     # false/true
+
+# Add or remove newline before 'if'
+nl_before_if                             = ignore   # ignore/add/remove/force
+
+# Add or remove newline after 'if'
+nl_after_if                              = ignore   # ignore/add/remove/force
+
+# Add or remove newline before 'for'
+nl_before_for                            = ignore   # ignore/add/remove/force
+
+# Add or remove newline after 'for'
+nl_after_for                             = ignore   # ignore/add/remove/force
+
+# Add or remove newline before 'while'
+nl_before_while                          = ignore   # ignore/add/remove/force
+
+# Add or remove newline after 'while'
+nl_after_while                           = ignore   # ignore/add/remove/force
+
+# Add or remove newline before 'switch'
+nl_before_switch                         = force   # ignore/add/remove/force
+
+# Add or remove newline after 'switch'
+nl_after_switch                          = force   # ignore/add/remove/force
+
+# Add or remove newline before 'do'
+nl_before_do                             = ignore   # ignore/add/remove/force
+
+# Add or remove newline after 'do'
+nl_after_do                              = ignore   # ignore/add/remove/force
+
+# Whether to double-space commented-entries in struct/enum
+nl_ds_struct_enum_cmt                    = false    # false/true
+
+# Whether to double-space before the close brace of a struct/union/enum
+nl_ds_struct_enum_close_brace            = false    # false/true
+
+# Add or remove a newline around a class colon.
+# Related to pos_class_colon, nl_class_init_args, and pos_comma.
+nl_class_colon                           = ignore   # ignore/add/remove/force
+
+# Change simple unbraced if statements into a one-liner
+# 'if(b)\n i++;' => 'if(b) i++;'
+nl_create_if_one_liner                   = false    # false/true
+
+# Change simple unbraced for statements into a one-liner
+# 'for (i=0;i<5;i++)\n foo(i);' => 'for (i=0;i<5;i++) foo(i);'
+nl_create_for_one_liner                  = false    # false/true
+
+# Change simple unbraced while statements into a one-liner
+# 'while (i<5)\n foo(i++);' => 'while (i<5) foo(i++);'
+nl_create_while_one_liner                = false    # false/true
+
+#
+# Positioning options
+#
+
+# The position of arithmetic operators in wrapped expressions
+pos_arith                                = lead   # ignore/lead/trail
+
+# The position of assignment in wrapped expressions
+pos_assign                               = trail   # ignore/lead/trail
+
+# The position of boolean operators in wrapped expressions
+pos_bool                                 = lead    # ignore/lead/trail
+
+# The position of the comma in wrapped expressions
+pos_comma                                = trail   # ignore/lead/trail
+
+# The position of the comma in the constructor initialization list
+pos_class_comma                          = trail   # ignore/lead/trail
+
+# The position of colons between constructor and member initialization
+pos_class_colon                          = lead   # ignore/lead/trail
+
+#
+# Line Splitting options
+#
+
+# Try to limit code width to N number of columns
+code_width                               = 76        # number
+
+# Whether to fully split long 'for' statements at semi-colons
+ls_for_split_full                        = true    # false/true
+
+# Whether to fully split long function protos/calls at commas
+ls_func_split_full                       = true    # false/true
+
+#
+# Blank line options
+#
+
+# The maximum consecutive newlines
+nl_max                                   = 4        # number
+
+# The number of newlines after a function prototype, if followed by another function prototype
+nl_after_func_proto                      = 0        # number
+
+# The number of newlines after a function prototype, if not followed by another function prototype
+nl_after_func_proto_group                = 3        # number
+
+# The number of newlines after '}' of a multi-line function body
+nl_after_func_body                       = 3        # number
+
+# The number of newlines after '}' of a single line function body
+nl_after_func_body_one_liner             = 1        # number
+
+# The minimum number of newlines before a multi-line comment.
+# Doesn't apply if after a brace open or another multi-line comment.
+nl_before_block_comment                  = 2        # number
+
+# The minimum number of newlines before a single-line C comment.
+# Doesn't apply if after a brace open or other single-line C comments.
+nl_before_c_comment                      = 1        # number
+
+# The minimum number of newlines before a CPP comment.
+# Doesn't apply if after a brace open or other CPP comments.
+nl_before_cpp_comment                    = 0        # number
+
+# Whether to force a newline after a mulit-line comment.
+nl_after_multiline_comment               = false    # false/true
+
+# The number of newlines before a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label.
+# Will not change the newline count if after a brace open.
+# 0 = No change.
+nl_before_access_spec                    = 1        # number
+
+# The number of newlines after a 'private:', 'public:', 'protected:', 'signals:', or 'slots:' label.
+# 0 = No change.
+nl_after_access_spec                     = 1        # number
+
+# The number of newlines between a function def and the function comment.
+# 0 = No change.
+nl_comment_func_def                      = 0        # number
+
+# Whether to remove blank lines after '{'
+eat_blanks_after_open_brace              = true     # false/true
+
+# Whether to remove blank lines before '}'
+eat_blanks_before_close_brace            = true     # false/true
+
+#
+# Code modifying options (non-whitespace)
+#
+
+# Add or remove braces on single-line 'do' statement
+mod_full_brace_do                        = add      # ignore/add/remove/force
+
+# Add or remove braces on single-line 'for' statement
+mod_full_brace_for                       = add      # ignore/add/remove/force
+
+# Add or remove braces on single-line function defintions. (Pawn)
+mod_full_brace_function                  = ignore   # ignore/add/remove/force
+
+# Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'.
+mod_full_brace_if                        = ignore      # ignore/add/remove/force
+
+# Don't remove braces around statements that span N newlines
+mod_full_brace_nl                        = 0        # number
+
+# Add or remove braces on single-line 'while' statement
+mod_full_brace_while                     = add      # ignore/add/remove/force
+
+# Add or remove unnecessary paren on 'return' statement
+mod_paren_on_return                      = remove      # ignore/add/remove/force
+
+# Whether to change optional semicolons to real semicolons
+mod_pawn_semicolon                       = false    # false/true
+
+# Add parens on 'while' and 'if' statement around bools
+mod_full_paren_if_bool                   = true     # false/true
+
+# Whether to remove superfluous semicolons
+mod_remove_extra_semicolon               = true     # false/true
+
+# If a function body exceeds the specified number of newlines and doesn't have a comment after
+# the close brace, a comment will be added.
+mod_add_long_function_closebrace_comment = 5        # number
+
+# If a switch body exceeds the specified number of newlines and doesn't have a comment after
+# the close brace, a comment will be added.
+mod_add_long_switch_closebrace_comment   = 5        # number
+
+# If TRUE, will sort consecutive single-line 'import' statements [Java, D]
+mod_sort_import                          = false    # false/true
+
+# If TRUE, will sort consecutive single-line 'using' statements [C#]
+mod_sort_using                           = false    # false/true
+
+# If TRUE, will sort consecutive single-line '#include' statements [C/C++] and '#import' statements [Obj-C]
+# This is generally a bad idea, as it may break your code.
+mod_sort_include                         = false    # false/true
+
+# If TRUE, it will move a 'break' that appears after a fully braced 'case' before the close brace.
+mod_move_case_break                      = false    # false/true
+
+# If TRUE, it will remove a void 'return;' that appears as the last statement in a function.
+mod_remove_empty_return                  = true     # false/true
+
+#
+# Comment modifications
+#
+
+# Try to wrap comments at cmt_width columns
+cmt_width                                = 0        # number
+
+# If false, disable all multi-line comment changes, including cmt_width and leading chars.
+# Default is true.
+cmt_indent_multi                         = true     # false/true
+
+# Whether to group c-comments that look like they are in a block
+cmt_c_group                              = false    # false/true
+
+# Whether to put an empty '/*' on the first line of the combined c-comment
+cmt_c_nl_start                           = false    # false/true
+
+# Whether to put a newline before the closing '*/' of the combined c-comment
+cmt_c_nl_end                             = false    # false/true
+
+# Whether to group cpp-comments that look like they are in a block
+cmt_cpp_group                            = false    # false/true
+
+# Whether to put an empty '/*' on the first line of the combined cpp-comment
+cmt_cpp_nl_start                         = false    # false/true
+
+# Whether to put a newline before the closing '*/' of the combined cpp-comment
+cmt_cpp_nl_end                           = false    # false/true
+
+# Whether to change cpp-comments into c-comments
+cmt_cpp_to_c                             = false    # false/true
+
+# Whether to put a star on subsequent comment lines
+cmt_star_cont                            = true     # false/true
+
+# The number of spaces to insert at the start of subsequent comment lines
+cmt_sp_before_star_cont                  = 0        # number
+
+# The number of spaces to insert after the star on subsequent comment lines
+cmt_sp_after_star_cont                   = 1        # number
+
+# For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of
+# the comment are the same length. Default=True
+cmt_multi_check_last                     = true     # false/true
+
+# The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment.
+# Will substitue $(filename) with the current file's name.
+cmt_insert_file_header                   = ""         # string
+
+# The filename that contains text to insert before a function implementation if the function isn't preceeded with a C/C++ comment.
+# Will substitue $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff.
+# Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... }
+cmt_insert_func_header                   = ""         # string
+
+# The filename that contains text to insert before a class if the class isn't preceeded with a C/C++ comment.
+# Will substitue $(class) with the class name.
+cmt_insert_class_header                  = ""         # string
+
+# If a preprocessor is encountered when stepping backwards from a function name, then
+# this option decides whether the comment should be inserted.
+# Affects cmt_insert_func_header and cmt_insert_class_header.
+cmt_insert_before_preproc                = false    # false/true
+
+#
+# Preprocessor options
+#
+
+# Control indent of preprocessors inside #if blocks at brace level 0
+pp_indent                                = remove    # ignore/add/remove/force
+
+# Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false)
+pp_indent_at_level                       = false    # false/true
+
+# If pp_indent_at_level=false, specifies the number of columns to indent per level. Default=1.
+pp_indent_count                          = 1        # number
+
+# Add or remove space after # based on pp_level of #if blocks
+pp_space                                 = add   # ignore/add/remove/force
+
+# Sets the number of spaces added with pp_space
+pp_space_count                           = 1        # number
+
+# The indent for #region and #endregion in C# and '#pragma region' in C/C++
+pp_indent_region                         = 0        # number
+
+# Whether to indent the code between #region and #endregion
+pp_region_indent_code                    = false    # false/true
+
+# If pp_indent_at_level=true, sets the indent for #if, #else, and #endif when not at file-level
+pp_indent_if                             = 0        # number
+
+# Control whether to indent the code between #if, #else and #endif when not at file-level
+pp_if_indent_code                        = false    # false/true
+
+# Whether to indent '#define' at the brace level (true) or from column 1 (false)
+pp_define_at_level                       = false    # false/true
+
+# You can force a token to be a type with the 'type' option.
+# Example:
+# type myfoo1 myfoo2
+#
+# You can create custom macro-based indentation using macro-open,
+# macro-else and macro-close.
+# Example:
+# macro-open  BEGIN_TEMPLATE_MESSAGE_MAP
+# macro-open  BEGIN_MESSAGE_MAP
+# macro-close END_MESSAGE_MAP
+#
+# You can assign any keyword to any type with the set option.
+# set func_call_user _ N_

=== modified file 'configure.ac'
--- configure.ac	2010-06-30 18:41:07 +0000
+++ configure.ac	2010-07-01 01:31:26 +0000
@@ -6,11 +6,15 @@
 # the COPYING file in this directory for full text.
 
 AC_PREREQ(2.59)
+<<<<<<< TREE
 AC_INIT([gearmand],[0.14],[https://launchpad.net/gearmand])
+=======
+AC_INIT([gearmand],[1.00],[https://launchpad.net/gearmand])
+>>>>>>> MERGE-SOURCE
 AC_CONFIG_SRCDIR(libgearman/gearman.c)
 AC_CONFIG_AUX_DIR(config)
 
-PANDORA_CANONICAL_TARGET(require-cxx)
+PANDORA_CANONICAL_TARGET(require-cxx, less-warnings)
 
 GEARMAN_LIBRARY_VERSION=4:0:0
 #                       | | |
@@ -27,6 +31,9 @@
 AC_SUBST(GEARMAN_LIBRARY_VERSION)
 
 
+PANDORA_REQUIRE_BOOST
+PANDORA_REQUIRE_BOOST_PROGRAM_OPTIONS
+PANDORA_REQUIRE_BOOST_THREAD
 PANDORA_REQUIRE_PTHREAD
 PANDORA_REQUIRE_LIBEVENT
 PANDORA_REQUIRE_LIBUUID

=== renamed file 'gearmand/gearmand.c' => 'gearmand/gearmand.cc'
--- gearmand/gearmand.c	2010-02-02 00:43:22 +0000
+++ gearmand/gearmand.cc	2010-07-01 01:31:26 +0000
@@ -8,6 +8,9 @@
 
 #include "config.h"
 
+#define __STDC_LIMIT_MACROS
+#define __STDC_FORMAT_MACROS
+
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
@@ -53,428 +56,316 @@
 # endif
 #endif
 
+#include <boost/program_options/options_description.hpp>
+#include <boost/program_options/parsers.hpp>
+#include <boost/program_options/variables_map.hpp>
+#include <boost/tokenizer.hpp>
+#include <boost/token_functions.hpp>
+using namespace boost;
+using namespace boost::program_options;
+
 #include <libgearman-server/gearmand.h>
 
-#ifdef HAVE_LIBDRIZZLE
-#include <libgearman-server/queue_libdrizzle.h>
-#endif
-
-#ifdef HAVE_LIBMEMCACHED
-#include <libgearman-server/queue_libmemcached.h>
-#endif
-
-#ifdef HAVE_LIBSQLITE3
-#include <libgearman-server/queue_libsqlite3.h>
-#endif
-
-#ifdef HAVE_LIBPQ
-#include <libgearman-server/queue_libpq.h>
-#endif
-
-#ifdef HAVE_LIBTOKYOCABINET
-#include <libgearman-server/queue_libtokyocabinet.h>
-#endif
-
-#include <libgearman-server/protocol_http.h>
+
+#include <iostream>
+#include <fstream>
+using namespace std;
+
+#include <string>
+
+using std::string;
 
 #define GEARMAND_LOG_REOPEN_TIME 60
 #define GEARMAND_LISTEN_BACKLOG 32
 
-typedef struct
+struct gearmand_log_info_st
 {
-  const char *file;
+  string file;
   int fd;
   time_t reopen;
-} gearmand_log_info_st;
+
+  gearmand_log_info_st() :
+    fd(-1),
+    reopen(0)
+  {}
+
+  ~gearmand_log_info_st() {}
+
+};
 
 static gearmand_st *_gearmand;
 
 static bool _set_fdlimit(rlim_t fds);
 static bool _pid_write(const char *pid_file);
 static void _pid_delete(const char *pid_file);
-static bool _switch_user(const char *user);
+static bool _switch_user(const string user);
 static bool _set_signals(void);
 static void _shutdown_handler(int signal_arg);
-static void _log(const char *line, gearman_verbose_t verbose, void *context);
+
 
 int main(int argc, char *argv[])
 {
-  gearman_conf_st conf;
-  gearman_conf_module_st module;
-  const char *name;
-  const char *value;
+  options_description general("General options");
+
   int backlog= GEARMAND_LISTEN_BACKLOG;
   rlim_t fds= 0;
+  string pid_file;
   uint8_t job_retries= 0;
   uint8_t worker_wakeup= 0;
-  in_port_t port= 0;
-  const char *host= NULL;
-  const char *pid_file= NULL;
-  const char *queue_type= NULL;
-  uint32_t threads= 0;
-  const char *user= NULL;
-  uint8_t verbose= 0;
+  in_port_t port;
+  string host;
+  string queue_type;
+  uint32_t threads;
+  string user;
+  gearman_verbose_t verbose;
+  string verbose_string;
   gearman_return_t ret;
   gearmand_log_info_st log_info;
   bool close_stdio= false;
-  int fd;
-  bool round_robin= false;
+  string protocol;
+  bool round_robin;
 
-  log_info.file= NULL;
   log_info.fd= -1;
   log_info.reopen= 0;
 
-  if (gearman_conf_create(&conf) == NULL)
-  {
-    fprintf(stderr, "gearmand: gearman_conf_create: NULL\n");
-    return 1;
-  }
-
-  if (gearman_conf_module_create(&conf, &module, NULL) == NULL)
-  {
-    fprintf(stderr, "gearmand: gearman_conf_module_create: NULL\n");
-    return 1;
-  }
-
-  /* Add all main configuration options. */
-#define MCO(__name, __short, __value, __help) \
-  gearman_conf_module_add_option(&module, __name, __short, __value, __help);
-
-  MCO("backlog", 'b', "BACKLOG", "Number of backlog connections for listen.")
-  MCO("daemon", 'd', NULL, "Daemon, detach and run in the background.")
-  MCO("file-descriptors", 'f', "FDS",
-      "Number of file descriptors to allow for the process (total connections "
-      "will be slightly less). Default is max allowed for user.")
-  MCO("help", 'h', NULL, "Print this help menu.");
-  MCO("job-retries", 'j', "RETRIES",
-      "Number of attempts to run the job before the job server removes it. This"
-      "is helpful to ensure a bad job does not crash all available workers. "
-      "Default is no limit.")
-  MCO("log-file", 'l', "FILE",
-      "Log file to write errors and information to. Turning this option on "
-      "also forces the first verbose level to be enabled.")
-  MCO("listen", 'L', "ADDRESS",
-      "Address the server should listen on. Default is INADDR_ANY.")
-  MCO("port", 'p', "PORT", "Port the server should listen on.")
-  MCO("pid-file", 'P', "FILE", "File to write process ID out to.")
-  MCO("protocol", 'r', "PROTOCOL", "Load protocol module.")
-  MCO("round-robin", 'R', NULL, "Assign work in round-robin order per worker"
-      "connection. The default is to assign work in the order of functions "
-      "added by the worker.")
-  MCO("queue-type", 'q', "QUEUE", "Persistent queue type to use.")
-  MCO("threads", 't', "THREADS", "Number of I/O threads to use. Default=0.")
-  MCO("user", 'u', "USER", "Switch to given user after startup.")
-  MCO("verbose", 'v', NULL, "Increase verbosity level by one.")
-  MCO("version", 'V', NULL, "Display the version of gearmand and exit.")
-  MCO("worker-wakeup", 'w', "WORKERS",
-      "Number of workers to wakeup for each job received. The default is to "
-      "wakeup all available workers.")
-
-  /* Make sure none of the gearman_conf_module_add_option calls failed. */
-  if (gearman_conf_return(&conf) != GEARMAN_SUCCESS)
-  {
-    fprintf(stderr, "gearmand: gearman_conf_module_add_option: %s\n",
-            gearman_conf_error(&conf));
-    return 1;
-  }
+  general.add_options()
+  ("backlog,b", value(&backlog)->default_value(GEARMAND_LISTEN_BACKLOG), "Number of backlog connections for listen.")
+  ("daemon,d", "Daemon, detach and run in the background.")
+  ("file-descriptors,f", value(&fds), "Number of file descriptors to allow for the process (total connections will be slightly less). Default is max allowed for user.")
+  ("help,h", "Print this help menu.")
+  ("job-retries,j", value(&job_retries), "Number of attempts to run the job before the job server removes it. This is helpful to ensure a bad job does not crash all available workers. Default is no limit.")
+  ("listen,L", value(&host), "Address the server should listen on. Default is INADDR_ANY.")
+  ("port,p", value(&port)->default_value(GEARMAN_DEFAULT_TCP_PORT), "Port the server should listen on.")
+  ("pid-file,P", value(&pid_file), "File to write process ID out to.")
+  ("protocol,r", value(&protocol), "Load protocol module.")
+  ("round-robin,R", bool_switch(&round_robin)->default_value(false), "Assign work in round-robin order per worker connection. The default is to assign work in the order of functions added by the worker.")
+  ("queue-type,q", value(&queue_type), "Persistent queue type to use.")
+  ("threads,t", value(&threads)->default_value(0), "Number of I/O threads to use. Default=4.")
+  ("user,u", value(&user), "Switch to given user after startup.")
+  ("verbose,v", value(&verbose_string)->default_value("v"), "Increase verbosity level by one.")
+  ("version,V", "Display the version of gearmand and exit.")
+  ("worker-wakeup,w", value(&worker_wakeup), "Number of workers to wakeup for each job received. The default is to wakeup all available workers.")
+  ;
+  options_description all("Allowed options");
+  all.add(general);
+
+  // Add in all of the options found for our logging modules
+  all.add(Log::Instance()->options());
 
   /* Add queue configuration options. */
+#ifdef HAVE_LIBSQLITE3
+  SqliteQueue libsqlite;
+  all.add(libsqlite.options());
+#endif
 
 #ifdef HAVE_LIBDRIZZLE
-  if (gearman_server_queue_libdrizzle_conf(&conf) != GEARMAN_SUCCESS)
-  {
-    fprintf(stderr, "gearmand: gearman_queue_libdrizzle_conf: %s\n",
-            gearman_conf_error(&conf));
-    return 1;
-  }
+  LibDrizzleQueue libdrizzle;
+  all.add(libdrizzle.options());
+#endif
+
+#ifdef HAVE_LIBTOKYOCABINET
+  TokyoCabinetQueue libtokyocabinet;
+  all.add(libtokyocabinet.options());
 #endif
 
 #ifdef HAVE_LIBMEMCACHED
-  if (gearman_server_queue_libmemcached_conf(&conf) != GEARMAN_SUCCESS)
-  {
-    fprintf(stderr, "gearmand: gearman_queue_libmemcached_conf: %s\n",
-            gearman_conf_error(&conf));
-    return 1;
-  }
-#endif
-#ifdef HAVE_LIBTOKYOCABINET
-  if (gearman_server_queue_libtokyocabinet_conf(&conf) != GEARMAN_SUCCESS)
-  {
-    fprintf(stderr, "gearmand: gearman_queue_libtokyocabinet_conf: %s\n",
-            gearman_conf_error(&conf));
-    return 1;
-  }
-#endif
-
-#ifdef HAVE_LIBSQLITE3
-  if (gearman_server_queue_libsqlite3_conf(&conf) != GEARMAN_SUCCESS)
-  {
-    fprintf(stderr, "gearmand: gearman_queue_libsqlite3_conf: %s\n",
-            gearman_conf_error(&conf));
-    return 1;
-  }
+  LibmemcachedQueue libmemcached;
+  all.add(libmemcached.options());
 #endif
 
 #ifdef HAVE_LIBPQ
-  if (gearman_server_queue_libpq_conf(&conf) != GEARMAN_SUCCESS)
-  {
-    fprintf(stderr, "gearmand: gearman_queue_libpq_conf: %s\n",
-            gearman_conf_error(&conf));
-    return 1;
-  }
+  LibPqQueue postgres;
+  all.add(postgres.options());
 #endif
 
-  if (gearmand_protocol_http_conf(&conf) != GEARMAN_SUCCESS)
-  {
-    fprintf(stderr, "gearmand: gearman_protocol_http_conf: %s\n",
-            gearman_conf_error(&conf));
-    return 1;
-  }
-
-  /* Let gearman conf parse the command line arguments. */
-  if (gearman_conf_parse_args(&conf, argc, argv) != GEARMAN_SUCCESS)
-  {
-    printf("\n%s\n\n", gearman_conf_error(&conf));
-    printf("gearmand %s - %s\n\n", gearman_version(), gearman_bugreport());
-    printf("usage: %s [OPTIONS]\n", argv[0]);
-    gearman_conf_usage(&conf);
-    return 1;
-  }
-
-  /* Check for option values that were given. */
-  while (gearman_conf_module_value(&module, &name, &value))
-  {
-    if (!strcmp(name, "backlog"))
-      backlog= atoi(value);
-    else if (!strcmp(name, "daemon"))
-    {
-      switch (fork())
-      {
-      case -1:
-        fprintf(stderr, "gearmand: fork:%d\n", errno);
-        return 1;
-
-      case 0:
-        break;
-
-      default:
-        return 0;
-      }
-
-      if (setsid() == -1)
-      {
-        fprintf(stderr, "gearmand: setsid:%d\n", errno);
-        return 1;
-      }
-
-      close_stdio= true;
-    }
-    else if (!strcmp(name, "file-descriptors"))
-      fds= (rlim_t)atoi(value);
-    else if (!strcmp(name, "help"))
-    {
-      printf("\ngearmand %s - %s\n\n", gearman_version(), gearman_bugreport());
-      printf("usage: %s [OPTIONS]\n", argv[0]);
-      gearman_conf_usage(&conf);
-      return 1;
-    }
-    else if (!strcmp(name, "job-retries"))
-      job_retries= (uint8_t)atoi(value);
-    else if (!strcmp(name, "log-file"))
-      log_info.file= value;
-    else if (!strcmp(name, "listen"))
-      host= value;
-    else if (!strcmp(name, "port"))
-      port= (in_port_t)atoi(value);
-    else if (!strcmp(name, "pid-file"))
-      pid_file= value;
-    else if (!strcmp(name, "protocol"))
-      continue;
-    else if (!strcmp(name, "queue-type"))
-      queue_type= value;
-    else if (!strcmp(name, "threads"))
-      threads= (uint32_t)atoi(value);
-    else if (!strcmp(name, "user"))
-      user= value;
-    else if (!strcmp(name, "verbose"))
-      verbose++;
-    else if (!strcmp(name, "round-robin"))
-      round_robin++;
-    else if (!strcmp(name, "version"))
-      printf("\ngearmand %s - %s\n", gearman_version(), gearman_bugreport());
-    else if (!strcmp(name, "worker-wakeup"))
-      worker_wakeup= (uint8_t)atoi(value);
-    else
-    {
-      fprintf(stderr, "gearmand: Unknown option:%s\n", name);
-      return 1;
-    }
+  GearmanHTTP http;
+  all.add(http.options());
+
+  variables_map vm;
+
+  try {
+    store(parse_command_line(argc, argv, all), vm);
+    notify(vm);
+  }
+
+  catch(std::exception &e)
+  {
+    cout << e.what() << "\n";
+    return 1;
+  }
+
+  if (vm.count("help"))
+  {
+    cout << all << "\n";
+    return 1;
+  }
+
+  if (vm.count("version"))
+  {
+    cout << "\ngearmand " << gearman_version() << " - " <<  gearman_bugreport() << "\n";
+    return 1;
+  }
+
+  verbose= static_cast<gearman_verbose_t>(verbose_string.length());
+
+  /*
+    @note Logging begins from this point on.
+  */
+  Log::Instance()->start(verbose);
+
+  if (vm.count("daemon"))
+  {
+    switch (fork())
+    {
+    case -1:
+      Log::Instance()->fatal("gearmand: fork:%d\n", errno);
+      return 1;
+
+    case 0:
+      break;
+
+    default:
+      return 0;
+    }
+
+    if (setsid() == -1)
+    {
+      Log::Instance()->fatal("gearmand: setsid:%d\n", errno);
+      return 1;
+    }
+
+    close_stdio= true;
   }
 
   if (verbose == 0 && close_stdio)
   {
     /* If we can't remap stdio, it should not a fatal error. */
-    fd = open("/dev/null", O_RDWR, 0);
+    int fd= open("/dev/null", O_RDWR, 0);
+
     if (fd != -1)
     {
       if (dup2(fd, STDIN_FILENO) == -1)
       {
-        fprintf(stderr, "gearmand: dup2:%d\n", errno);
+        Log::Instance()->fatal("gearmand: dup2:%d\n", errno);
         return 1;
       }
 
       if (dup2(fd, STDOUT_FILENO) == -1)
       {
-        fprintf(stderr, "gearmand: dup2:%d\n", errno);
+        Log::Instance()->fatal("gearmand: dup2:%d\n", errno);
         return 1;
       }
 
       if (dup2(fd, STDERR_FILENO) == -1)
       {
-        fprintf(stderr, "gearmand: dup2:%d\n", errno);
+        Log::Instance()->fatal("gearmand: dup2:%d\n", errno);
         return 1;
       }
 
       close(fd);
     }
   }
-
   if ((fds > 0 && _set_fdlimit(fds)) || _switch_user(user) || _set_signals())
-    return 1;
-
-  if (pid_file != NULL && _pid_write(pid_file))
-    return 1;
-
-  _gearmand= gearmand_create(host, port);
+    return -1;
+
+  if (not pid_file.empty()  && _pid_write(pid_file.c_str()))
+    return -1;
+
+  _gearmand= new gearmand_st(host.empty() ? NULL : host.c_str(),
+                             port,
+                             threads);
   if (_gearmand == NULL)
   {
-    fprintf(stderr, "gearmand: Could not create gearmand library instance\n");
-    return 1;
+    Log::Instance()->fatal("gearmand: Could not create gearmand library instance\n");
+    return -1;
   }
 
-  gearmand_set_backlog(_gearmand, backlog);
-  gearmand_set_threads(_gearmand, threads);
-  gearmand_set_job_retries(_gearmand, job_retries);
-  gearmand_set_worker_wakeup(_gearmand, worker_wakeup);
-  gearmand_set_log_fn(_gearmand, _log, &log_info, verbose);
-  gearmand_set_round_robin(_gearmand, round_robin);
+  _gearmand->set_backlog(backlog);
+  _gearmand->set_server_job_retries(job_retries);
+  _gearmand->set_worker_wakeup(worker_wakeup);
+  _gearmand->set_round_robin(round_robin);
 
-  if (queue_type != NULL)
+  if (not queue_type.empty())
   {
+#ifdef HAVE_LIBSQLITE3
+    if (not queue_type.compare("libsqlite3"))
+    {
+      ret= libsqlite.start();
+      if (ret != GEARMAN_SUCCESS)
+        return 1;
+      _gearmand->server.queue= &libsqlite;
+      //_gearmand->server.queue= static_cast<GQueue *>(libsqlite);
+    }
+    else
+#endif
 #ifdef HAVE_LIBDRIZZLE
-    if (!strcmp(queue_type, "libdrizzle"))
+    if (not queue_type.compare("libdrizzle"))
     {
-      ret= gearmand_queue_libdrizzle_init(_gearmand, &conf);
+      ret= libdrizzle.start();
       if (ret != GEARMAN_SUCCESS)
         return 1;
+      _gearmand->server.queue= &libdrizzle;
     }
     else
 #endif
 #ifdef HAVE_LIBMEMCACHED
-    if (!strcmp(queue_type, "libmemcached"))
-    {
-      ret= gearmand_queue_libmemcached_init(_gearmand, &conf);
-      if (ret != GEARMAN_SUCCESS)
-        return 1;
-    }
-    else
-#endif
-#ifdef HAVE_LIBSQLITE3
-    if (!strcmp(queue_type, "libsqlite3"))
-    {
-      ret= gearmand_queue_libsqlite3_init(_gearmand, &conf);
-      if (ret != GEARMAN_SUCCESS)
-        return 1;
+    if (not queue_type.compare("libmemcached"))
+    {
+      ret= libmemcached.start();
+      if (ret != GEARMAN_SUCCESS)
+        return 1;
+      _gearmand->server.queue= &libmemcached;
     }
     else
 #endif
 #ifdef HAVE_LIBPQ
-    if (!strcmp(queue_type, "libpq"))
+    if (not queue_type.compare("libpq"))
     {
-      ret= gearmand_queue_libpq_init(_gearmand, &conf);
+      ret= postgres.start();
       if (ret != GEARMAN_SUCCESS)
         return 1;
+      _gearmand->server.queue= &postgres;
     }
     else
 #endif
 #ifdef HAVE_LIBTOKYOCABINET
-    if (!strcmp(queue_type, "libtokyocabinet"))
+    if (not queue_type.compare("libtokyocabinet"))
     {
-      ret= gearmand_queue_libtokyocabinet_init(_gearmand, &conf);
+      ret= libtokyocabinet.start();
       if (ret != GEARMAN_SUCCESS)
         return 1;
+      _gearmand->server.queue= &libtokyocabinet;
     }
     else
 #endif        
     {
-      fprintf(stderr, "gearmand: Unknown queue module: %s\n", queue_type);
-      return 1;
-    }
-  }
-
-  while (gearman_conf_module_value(&module, &name, &value))
-  {
-    if (strcmp(name, "protocol"))
-      continue;
-
-    if (!strcmp(value, "http"))
-    {
-      ret= gearmand_protocol_http_init(_gearmand, &conf);
-      if (ret != GEARMAN_SUCCESS)
-        return 1;
-    }
-    else
-    {
-      fprintf(stderr, "gearmand: Unknown protocol module: %s\n", value);
-      return 1;
-    }
-  }
-
-  ret= gearmand_run(_gearmand);
-
-  if (queue_type != NULL)
-  {
-#ifdef HAVE_LIBDRIZZLE
-    if (!strcmp(queue_type, "libdrizzle"))
-      gearmand_queue_libdrizzle_deinit(_gearmand);
-#endif
-#ifdef HAVE_LIBMEMCACHED
-    if (!strcmp(queue_type, "libmemcached"))
-      gearmand_queue_libmemcached_deinit(_gearmand);
-#endif
-#ifdef HAVE_LIBSQLITE3
-    if (!strcmp(queue_type, "libsqlite3"))
-      gearmand_queue_libsqlite3_deinit(_gearmand);
-#endif
-#ifdef HAVE_LIBPQ
-    if (!strcmp(queue_type, "libpq"))
-      gearmand_queue_libpq_deinit(_gearmand);
-#endif
-#ifdef HAVE_LIBTOKYOCABINET
-    if (!strcmp(queue_type, "libtokyocabinet"))
-      gearmand_queue_libtokyocabinet_deinit(_gearmand);
-#endif
-  }
-
-  while (gearman_conf_module_value(&module, &name, &value))
-  {
-    if (strcmp(name, "protocol"))
-      continue;
-
-    if (!strcmp(value, "http"))
-      gearmand_protocol_http_deinit(_gearmand);
-  }
-
-  gearmand_free(_gearmand);
-
-  if (pid_file != NULL)
-    _pid_delete(pid_file);
+      Log::Instance()->fatal("gearmand: Unknown queue module: %s\n", queue_type.c_str());
+      return 1;
+    }
+  }
+
+  if (not protocol.compare("http"))
+  {
+    ret= http.start(_gearmand);
+    if (ret != GEARMAN_SUCCESS)
+      return 1;
+  }
+  else if (not protocol.empty())
+  {
+    Log::Instance()->fatal("gearmand: Unknown protocol module: %s\n", protocol.c_str());
+    return 1;
+  }
+
+  ret= _gearmand->run();
+
+  delete _gearmand;
+
+  if (not pid_file.empty())
+    _pid_delete(pid_file.c_str());
 
   if (log_info.fd != -1)
     (void) close(log_info.fd);
 
-  gearman_conf_free(&conf);
-
   return (ret == GEARMAN_SUCCESS || ret == GEARMAN_SHUTDOWN) ? 0 : 1;
 }
 
@@ -484,8 +375,7 @@
 
   if (getrlimit(RLIMIT_NOFILE, &rl) == -1)
   {
-    fprintf(stderr, "gearmand: Could not get file descriptor limit:%d\n",
-            errno);
+    Log::Instance()->fatal("gearmand: Could not get file descriptor limit:%d\n", errno);
     return true;
   }
 
@@ -495,10 +385,10 @@
 
   if (setrlimit(RLIMIT_NOFILE, &rl) == -1)
   {
-    fprintf(stderr, "gearmand: Failed to set limit for the number of file "
-                    "descriptors (%d). Try running as root or giving a "
-                    "smaller value to -f.\n",
-            errno);
+    Log::Instance()->fatal("gearmand: Failed to set limit for the number of file "
+                           "descriptors (%d). Try running as root or giving a "
+                           "smaller value to -f.\n",
+                           errno);
     return true;
   }
 
@@ -512,8 +402,8 @@
   f= fopen(pid_file, "w");
   if (f == NULL)
   {
-    fprintf(stderr, "gearmand: Could not open pid file for writing: %s (%d)\n",
-            pid_file, errno);
+    Log::Instance()->fatal("gearmand: Could not open pid file for writing: %s (%d)\n",
+                           pid_file, errno);
     return true;
   }
 
@@ -521,8 +411,8 @@
 
   if (fclose(f) == -1)
   {
-    fprintf(stderr, "gearmand: Could not close the pid file: %s (%d)\n",
-            pid_file, errno);
+    Log::Instance()->fatal("gearmand: Could not close the pid file: %s (%d)\n",
+                           pid_file, errno);
     return true;
   }
 
@@ -533,40 +423,39 @@
 {
   if (unlink(pid_file) == -1)
   {
-    fprintf(stderr, "gearmand: Could not remove the pid file: %s (%d)\n",
-            pid_file, errno);
+    Log::Instance()->fatal("gearmand: Could not remove the pid file: %s (%d)\n",
+                           pid_file, errno);
   }
 }
 
-static bool _switch_user(const char *user)
+static bool _switch_user(const string user)
 {
   struct passwd *pw;
 
   if (getuid() == 0 || geteuid() == 0)
   {
-    if (user == NULL || user[0] == 0)
+    if (user.empty())
     {
-      fprintf(stderr,
-              "gearmand: Must specify '-u root' if you want to run as root\n");
+      Log::Instance()->fatal("gearmand: Must specify '-u root' if you want to run as root\n");
       return true;
     }
 
-    pw= getpwnam(user);
+    pw= getpwnam(user.c_str());
     if (pw == NULL)
     {
-      fprintf(stderr, "gearmand: Could not find user '%s'\n", user);
-      return 1;
+      Log::Instance()->fatal("gearmand: Could not find user '%s'\n", user.c_str());
+      return true;
     }
 
     if (setgid(pw->pw_gid) == -1 || setuid(pw->pw_uid) == -1)
     {
-      fprintf(stderr, "gearmand: Could not switch to user '%s'\n", user);
+      Log::Instance()->fatal("gearmand: Could not switch to user '%s'\n", user.c_str());
       return 1;
     }
   }
-  else if (user != NULL)
+  else if (not user.empty())
   {
-    fprintf(stderr, "gearmand: Must be root to switch users\n");
+    Log::Instance()->fatal("gearmand: Must be root to switch users\n");
     return true;
   }
 
@@ -583,26 +472,26 @@
   if (sigemptyset(&sa.sa_mask) == -1 ||
       sigaction(SIGPIPE, &sa, 0) == -1)
   {
-    fprintf(stderr, "gearmand: Could not set SIGPIPE handler (%d)\n", errno);
+    Log::Instance()->fatal("gearmand: Could not set SIGPIPE handler (%d)\n", errno);
     return true;
   }
 
   sa.sa_handler= _shutdown_handler;
   if (sigaction(SIGTERM, &sa, 0) == -1)
   {
-    fprintf(stderr, "gearmand: Could not set SIGTERM handler (%d)\n", errno);
+    Log::Instance()->fatal("gearmand: Could not set SIGTERM handler (%d)\n", errno);
     return true;
   }
 
   if (sigaction(SIGINT, &sa, 0) == -1)
   {
-    fprintf(stderr, "gearmand: Could not set SIGINT handler (%d)\n", errno);
+    Log::Instance()->fatal("gearmand: Could not set SIGINT handler (%d)\n", errno);
     return true;
   }
 
   if (sigaction(SIGUSR1, &sa, 0) == -1)
   {
-    fprintf(stderr, "gearmand: Could not set SIGUSR1 handler (%d)\n", errno);
+    Log::Instance()->fatal("gearmand: Could not set SIGUSR1 handler (%d)\n", errno);
     return true;
   }
 
@@ -612,48 +501,11 @@
 static void _shutdown_handler(int signal_arg)
 {
   if (signal_arg == SIGUSR1)
-    gearmand_wakeup(_gearmand, GEARMAND_WAKEUP_SHUTDOWN_GRACEFUL);
-  else
-    gearmand_wakeup(_gearmand, GEARMAND_WAKEUP_SHUTDOWN);
-}
-
-static void _log(const char *line, gearman_verbose_t verbose, void *context)
-{
-  gearmand_log_info_st *log_info= (gearmand_log_info_st *)context;
-  int fd;
-  time_t t;
-  char buffer[GEARMAN_MAX_ERROR_SIZE];
-
-  if (log_info->file == NULL)
-    fd= 1;
-  else
-  {
-    t= time(NULL);
-
-    if (log_info->fd != -1 && log_info->reopen < t)
-    {
-      (void) close(log_info->fd);
-      log_info->fd= -1;
-    }
-
-    if (log_info->fd == -1)
-    {
-      log_info->fd= open(log_info->file, O_CREAT | O_WRONLY | O_APPEND, 0644);
-      if (log_info->fd == -1)
-      {
-        fprintf(stderr, "gearmand: Could not open log file for writing (%d)\n",
-                errno);
-        return;
-      }
-
-      log_info->reopen= t + GEARMAND_LOG_REOPEN_TIME;
-    }
-
-    fd= log_info->fd;
-  }
-
-  snprintf(buffer, GEARMAN_MAX_ERROR_SIZE, "%5s %s\n",
-           gearman_verbose_name(verbose), line);
-  if (write(fd, buffer, strlen(buffer)) == -1)
-    fprintf(stderr, "gearmand: Could not write to log file: %d\n", errno);
+  {
+    _gearmand->set_wakeup(GEARMAND_WAKEUP_SHUTDOWN_GRACEFUL);
+  }
+  else
+  {
+    _gearmand->set_wakeup(GEARMAND_WAKEUP_SHUTDOWN);
+  }
 }

=== modified file 'gearmand/include.am'
--- gearmand/include.am	2009-12-18 18:19:29 +0000
+++ gearmand/include.am	2010-07-01 01:31:26 +0000
@@ -13,10 +13,11 @@
 sbin_PROGRAMS+= gearmand/gearmand
 
 gearmand_gearmand_LDADD= \
-	libgearman-server/libgearman-server.la \
-	${BETTER_MALLOC_LIBS}
+			 ${BOOST_LIBS} \
+			 libgearman-server/libgearman-server.la \
+			 ${BETTER_MALLOC_LIBS}
 
-gearmand_gearmand_SOURCES= gearmand/gearmand.c
+gearmand_gearmand_SOURCES= gearmand/gearmand.cc
 
 gearmand-valgrind: gearmand/gearmand
 	$(LIBTOOL) --mode=execute valgrind --leak-check=yes --show-reachable=yes  gearmand/gearmand

=== renamed file 'libgearman-server/client.c' => 'libgearman-server/client.cc'
--- libgearman-server/client.c	2010-04-06 21:41:46 +0000
+++ libgearman-server/client.cc	2010-07-01 01:31:26 +0000
@@ -1,4 +1,5 @@
 /* Gearman server and library
+ * Copyright (C) 2010 Data Differential
  * Copyright (C) 2008 Brian Aker, Eric Day
  * All rights reserved.
  *
@@ -11,12 +12,13 @@
  * @brief Server client definitions
  */
 
-#include "common.h"
+#include "libgearman-server/common.h"
 
 /*
  * Public definitions
  */
 
+<<<<<<< TREE
 gearman_server_client_st *
 gearman_server_client_add(gearman_server_con_st *con)
 {
@@ -93,4 +95,15 @@
     else
       free(client);
   }
+=======
+gearman_server_client_st::gearman_server_client_st() :
+  job(NULL),
+  job_next(NULL),
+  job_prev(NULL)
+{
+}
+
+gearman_server_client_st::~gearman_server_client_st()
+{
+>>>>>>> MERGE-SOURCE
 }

=== modified file 'libgearman-server/client.h'
--- libgearman-server/client.h	2010-03-11 19:58:32 +0000
+++ libgearman-server/client.h	2010-07-01 01:31:26 +0000
@@ -1,4 +1,5 @@
 /* Gearman server and library
+ * Copyright (C) 2010 Data Differential
  * Copyright (C) 2008 Brian Aker, Eric Day
  * All rights reserved.
  *
@@ -14,61 +15,20 @@
 #ifndef __GEARMAN_SERVER_CLIENT_H__
 #define __GEARMAN_SERVER_CLIENT_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
  * @ingroup gearman_server_client
  */
 struct gearman_server_client_st
 {
-  struct {
-    bool allocated;
-  } options;
   gearman_server_con_st *con;
   gearman_server_client_st *con_next;
   gearman_server_client_st *con_prev;
   gearman_server_job_st *job;
   gearman_server_client_st *job_next;
   gearman_server_client_st *job_prev;
+
+  gearman_server_client_st();
+  ~gearman_server_client_st();
 };
 
-/**
- * @addtogroup gearman_server_client Client Declarations
- * @ingroup gearman_server
- *
- * This is a low level interface for gearman server clients. This is used
- * internally by the server interface, so you probably want to look there first.
- *
- * @{
- */
-
-/**
- * Add a new client to a server instance.
- */
-GEARMAN_API
-gearman_server_client_st *
-gearman_server_client_add(gearman_server_con_st *con);
-
-/**
- * Initialize a server client structure.
- */
-GEARMAN_API
-gearman_server_client_st *
-gearman_server_client_create(gearman_server_con_st *con,
-                             gearman_server_client_st *client);
-
-/**
- * Free a server client structure.
- */
-GEARMAN_API
-void gearman_server_client_free(gearman_server_client_st *client);
-
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* __GEARMAN_SERVER_CLIENT_H__ */

=== modified file 'libgearman-server/common.h'
--- libgearman-server/common.h	2010-04-02 02:04:04 +0000
+++ libgearman-server/common.h	2010-07-01 01:31:26 +0000
@@ -1,4 +1,5 @@
 /* Gearman server and library
+ * Copyright (C) 2010 Data Differential
  * Copyright (C) 2008 Brian Aker, Eric Day
  * All rights reserved.
  *
@@ -16,8 +17,13 @@
 
 #include "config.h"
 
+#define __STDC_LIMIT_MACROS
+#define __STDC_FORMAT_MACROS
+
+#include <cstdarg>
+
 #define GEARMAN_CORE
-#include "gearmand.h"
+#include "libgearman-server/gearmand.h"
 
 #ifdef HAVE_ASSERT_H
 #include <assert.h>
@@ -34,9 +40,6 @@
 #ifdef HAVE_PTHREAD
 #include <pthread.h>
 #endif
-#ifdef HAVE_STDARG_H
-#include <stdarg.h>
-#endif
 #ifdef HAVE_STDDEF_H
 #include <stddef.h>
 #endif
@@ -116,30 +119,6 @@
 }
 
 /**
- * Add an object to a fifo list.
- * @ingroup gearman_constants
- */
-#define GEARMAN_FIFO_ADD(__list, __obj, __prefix) { \
-  if (__list ## _end == NULL) \
-    __list ## _list= __obj; \
-  else \
-    __list ## _end->__prefix ## next= __obj; \
-  __list ## _end= __obj; \
-  __list ## _count++; \
-}
-
-/**
- * Delete an object from a fifo list.
- * @ingroup gearman_constants
- */
-#define GEARMAN_FIFO_DEL(__list, __obj, __prefix) { \
-  __list ## _list= __obj->__prefix ## next; \
-  if (__list ## _list == NULL) \
-    __list ## _end= NULL; \
-  __list ## _count--; \
-}
-
-/**
  * Add an object to a hash.
  * @ingroup gearman_constants
  */
@@ -184,4 +163,18 @@
 }
 #endif
 
+#include <boost/bind.hpp>
+#include <boost/foreach.hpp>
+#include <boost/program_options/options_description.hpp>
+#include <boost/program_options/parsers.hpp>
+#include <boost/program_options/variables_map.hpp>
+#include <boost/shared_ptr.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/thread/condition.hpp>
+#include <boost/thread/mutex.hpp>
+#include <boost/thread/thread.hpp>
+#include <boost/token_functions.hpp>
+#include <boost/tokenizer.hpp>
+#include <boost/unordered_map.hpp>
+
 #endif /* __GEARMAN_SERVER_COMMON_H__ */

=== renamed file 'libgearman-server/conf.c' => 'libgearman-server/conf.c.THIS'
=== removed file 'libgearman-server/conf.h'
--- libgearman-server/conf.h	2010-03-11 20:33:13 +0000
+++ libgearman-server/conf.h	1970-01-01 00:00:00 +0000
@@ -1,103 +0,0 @@
-/* Gearman server and library
- * Copyright (C) 2009 Eric Day
- * All rights reserved.
- *
- * Use and distribution licensed under the BSD license.  See
- * the COPYING file in the parent directory for full text.
- */
-
-/**
- * @file
- * @brief Configuration Declarations
- */
-
-#ifndef __GEARMAN_SERVER_CONF_H__
-#define __GEARMAN_SERVER_CONF_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @addtogroup gearman_conf Configuration Declarations
- * @ingroup gearman_server
- * @{
- */
-
-struct gearman_conf_option_st
-{
-  size_t value_count;
-  gearman_conf_module_st *module;
-  const char *name;
-  const char *value_name;
-  const char *help;
-  char **value_list;
-};
-
-struct gearman_conf_st
-{
-  struct {
-    bool allocated;
-  } options;
-  gearman_return_t last_return;
-  int last_errno;
-  size_t module_count;
-  size_t option_count;
-  size_t short_count;
-  gearman_conf_module_st **module_list;
-  gearman_conf_option_st *option_list;
-  struct option *option_getopt;
-  char option_short[GEARMAN_CONF_MAX_OPTION_SHORT];
-  char last_error[GEARMAN_MAX_ERROR_SIZE];
-};
-
-/**
- * Initialize a gearman conf structure.
- */
-GEARMAN_API
-gearman_conf_st *gearman_conf_create(gearman_conf_st *conf);
-
-/**
- * Free a gearman conf structure.
- */
-GEARMAN_API
-void gearman_conf_free(gearman_conf_st *conf);
-
-/**
- * Return an return code for the last library error encountered.
- */
-GEARMAN_API
-gearman_return_t gearman_conf_return(gearman_conf_st *conf);
-
-/**
- * Return an error string for last library error encountered.
- */
-GEARMAN_API
-const char *gearman_conf_error(gearman_conf_st *conf);
-
-/**
- * Value of errno in the case of a GEARMAN_ERRNO return value.
- */
-GEARMAN_API
-int gearman_conf_errno(gearman_conf_st *conf);
-
-/**
- * Parse command line arguments.
- */
-GEARMAN_API
-gearman_return_t gearman_conf_parse_args(gearman_conf_st *conf, int argc,
-                                         char *argv[]);
-
-/**
- * Print usage information to stdout.
- */
-GEARMAN_API
-void gearman_conf_usage(gearman_conf_st *conf);
-
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __GEARMAN_SERVER_CONF_H__ */

=== renamed file 'libgearman-server/conf_module.c' => 'libgearman-server/conf_module.c.THIS'
=== removed file 'libgearman-server/conf_module.h'
--- libgearman-server/conf_module.h	2010-03-11 22:45:34 +0000
+++ libgearman-server/conf_module.h	1970-01-01 00:00:00 +0000
@@ -1,80 +0,0 @@
-/* Module configuration library
- * Copyright (C) 2009 Eric Day
- * All rights reserved.
- *
- * Use and distribution licensed under the BSD license.  See
- * the COPYING file in the parent directory for full text.
- */
-
-/**
- * @file
- * @brief Configuration Module Declarations
- */
-
-#ifndef __GEARMAN_SERVER_CONF_MODULE_H__
-#define __GEARMAN_SERVER_CONF_MODULE_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @addtogroup gearman_conf_module Configuration Module Declarations
- * @ingroup gearman_server
- * @{
- */
-
-struct gearman_conf_module_st
-{
-  struct {
-    bool allocated;
-  } options;
-  size_t current_option;
-  size_t current_value;
-  gearman_conf_st *conf;
-  const char *name;
-};
-
-/**
- * Initialize a gearman conf module structure.
- */
-GEARMAN_API
-gearman_conf_module_st *gearman_conf_module_create(gearman_conf_st *conf,
-                                                 gearman_conf_module_st *module,
-                                                 const char *name);
-
-/**
- * Free a gearman conf module structure.
- */
-GEARMAN_API
-void gearman_conf_module_free(gearman_conf_module_st *module);
-
-/**
- * Find a gearman conf module structure by name.
- */
-GEARMAN_API
-gearman_conf_module_st *gearman_conf_module_find(gearman_conf_st *conf,
-                                                 const char *name);
-
-/**
- * Add option for a module.
- */
-GEARMAN_API
-void gearman_conf_module_add_option(gearman_conf_module_st *module,
-                                    const char *name, int short_name,
-                                    const char *value_name, const char *help);
-
-/**
- * Loop through all values that were given for a set of module options.
- */
-GEARMAN_API
-bool gearman_conf_module_value(gearman_conf_module_st *module,
-                               const char **name, const char **value);
-
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __GEARMAN_SERVER_CONF_MODULE_H__ */

=== renamed file 'libgearman-server/connection.c' => 'libgearman-server/connection.cc'
--- libgearman-server/connection.c	2010-04-06 21:41:46 +0000
+++ libgearman-server/connection.cc	2010-07-01 01:31:26 +0000
@@ -1,4 +1,5 @@
 /* Gearman server and library
+ * Copyright (C) 2010 Data Differential
  * Copyright (C) 2008 Brian Aker, Eric Day
  * All rights reserved.
  *
@@ -11,12 +12,13 @@
  * @brief Server connection definitions
  */
 
-#include "common.h"
+#include "libgearman-server/common.h"
 
 /*
  * Public definitions
  */
 
+<<<<<<< TREE
 gearman_server_con_st *gearman_server_con_add(gearman_server_thread_st *thread,
                                               int fd, void *data)
 {
@@ -115,128 +117,150 @@
 
   con->host= NULL;
   con->port= NULL;
+=======
+gearman_server_con_st::gearman_server_con_st(gearman_server_thread_st *thread_arg) :
+  is_sleeping(false),
+  is_exceptions(false),
+  is_dead(false),
+  is_noop_sent(false),
+  ret(GEARMAN_SUCCESS),
+  io_list(false),
+  proc_list(false),
+  proc_removed(false),
+  worker_count(0),
+  client_count(0),
+  thread(thread_arg),
+  packet(NULL),
+  io_next(NULL),
+  io_prev(NULL),
+  proc_next(NULL),
+  proc_prev(NULL),
+  worker_list(NULL),
+  client_list(NULL),
+  _host(NULL),
+  _port(NULL)
+{
+  strcpy(_id, "-");
+
+  gearman_connection_options_t _options[] = { GEARMAN_CON_IGNORE_LOST_CONNECTION, GEARMAN_CON_MAX };
+  if (gearman_connection_create(&thread_arg->gearman, con(), _options) == NULL)
+  {
+    abort(); // Should be impossible
+  }
+}
+
+gearman_server_con_st::~gearman_server_con_st()
+{
+  _host= NULL;
+  _port= NULL;
+
+  {
+    boost::mutex::scoped_lock l(thread->lock);
+    thread->con_list.erase(this);
+  }
+>>>>>>> MERGE-SOURCE
 
   if (thread->server->flags.threaded &&
-      !(con->proc_removed) && !(thread->server->proc_shutdown))
+      !(proc_removed) && !(thread->server->proc_shutdown))
   {
-    con->is_dead= true;
-    con->is_sleeping= false;
-    con->is_exceptions= false;
-    con->is_noop_sent= false;
-    gearman_server_con_proc_add(con);
+    is_dead= true;
+    is_sleeping= false;
+    is_exceptions= false;
+    is_noop_sent= false;
+    proc_add();
     return;
   }
 
-  gearman_connection_free(&(con->con));
-
-  if (con->proc_list)
-    gearman_server_con_proc_remove(con);
-
-  if (con->io_list)
-    gearman_server_con_io_remove(con);
-
-  if (con->packet != NULL)
-  {
-    if (&(con->packet->packet) != con->con.recv_packet)
-      gearman_packet_free(&(con->packet->packet));
-    gearman_server_packet_free(con->packet, con->thread, true);
-  }
-
-  while (con->io_packet_list != NULL)
-    gearman_server_io_packet_remove(con);
-
-  while (con->proc_packet_list != NULL)
-  {
-    packet= gearman_server_proc_packet_remove(con);
-    gearman_packet_free(&(packet->packet));
-    gearman_server_packet_free(packet, con->thread, true);
-  }
-
-  gearman_server_con_free_workers(con);
-
-  while (con->client_list != NULL)
-    gearman_server_client_free(con->client_list);
-
-  (void) pthread_mutex_lock(&thread->lock);
-  GEARMAN_LIST_DEL(con->thread->con, con,)
-  (void) pthread_mutex_unlock(&thread->lock);
-
-  if (thread->free_con_count < GEARMAN_MAX_FREE_SERVER_CON)
-    GEARMAN_LIST_ADD(thread->free_con, con,)
-  else
-    free(con);
-}
-
-gearman_connection_st *gearman_server_con_con(gearman_server_con_st *con)
-{
-  return &con->con;
-}
-
-const void *gearman_server_con_data(const gearman_server_con_st *con)
-{
-  return gearman_connection_context(&(con->con));
-}
-
-void gearman_server_con_set_data(gearman_server_con_st *con, void *data)
-{
-  gearman_connection_set_context(&(con->con), data);
-}
-
-const char *gearman_server_con_host(gearman_server_con_st *con)
-{
-  return con->host;
-}
-
-void gearman_server_con_set_host(gearman_server_con_st *con, const char *host)
-{
-  con->host= host;
-}
-
-const char *gearman_server_con_port(gearman_server_con_st *con)
-{
-  return con->port;
-}
-
-void gearman_server_con_set_port(gearman_server_con_st *con, const char *port)
-{
-  con->port= port;
-}
-
-const char *gearman_server_con_id(gearman_server_con_st *con)
-{
-  return con->id;
-}
-
-void gearman_server_con_set_id(gearman_server_con_st *con, char *id,
-                               size_t size)
+  if (proc_list)
+    proc_remove();
+
+  if (io_list)
+    io_remove();
+
+  if (packet != NULL)
+  {
+    if (&packet->packet != con()->recv_packet)
+    { }
+    else
+    {
+      packet->release_packet= false;
+    }
+    delete packet;
+  }
+
+  assert(con()->options.allocated == false);
+  gearman_connection_free(con());
+
+  while (io_packet_list.size())
+  {
+    io_packet_remove();
+  }
+
+  while (proc_packet_list.size())
+  {
+    gearman_server_packet_st *packet_ptr;
+
+    packet_ptr= proc_packet_remove();
+    delete packet_ptr;
+  }
+
+  while (worker_list != NULL)
+  {
+    delete worker_list;
+  }
+
+  while (client_list != NULL)
+  {
+    client_list->con->thread->server->client_free(client_list);
+  }
+}
+
+const void *gearman_server_con_st::data()
+{
+  return gearman_connection_context(con());
+}
+
+void gearman_server_con_st::set_host(const char *host_arg)
+{
+  _host= host_arg;
+}
+
+void gearman_server_con_st::set_port(const char *port_arg)
+{
+  _port= port_arg;
+}
+
+void gearman_server_con_st::set_id(char *id_arg, size_t size)
 {
   if (size >= GEARMAN_SERVER_CON_ID_SIZE)
     size= GEARMAN_SERVER_CON_ID_SIZE - 1;
 
-  memcpy(con->id, id, size);
-  con->id[size]= 0;
+  memcpy(_id, id_arg, size);
+  _id[size]= 0;
 }
 
-void gearman_server_con_free_worker(gearman_server_con_st *con,
-                                    char *function_name,
-                                    size_t function_name_size)
+void gearman_server_con_st::free_worker(const char *function_name_arg,
+                                        size_t function_name_size_arg)
 {
-  gearman_server_worker_st *worker= con->worker_list;
+  gearman_server_worker_st *worker= worker_list;
   gearman_server_worker_st *prev_worker= NULL;
 
   while (worker != NULL)
   {
-    if (worker->function->function_name_size == function_name_size &&
-        !memcmp(worker->function->function_name, function_name,
-                function_name_size))
+    if (worker->function->function_name.length() == function_name_size_arg &&
+        !memcmp(worker->function->function_name.c_str(), function_name_arg, function_name_size_arg))
     {
-      gearman_server_worker_free(worker);
+      delete worker;
 
       /* Set worker to the last kept worker, or the beginning of the list. */
       if (prev_worker == NULL)
-        worker= con->worker_list;
+      {
+        worker= worker_list;
+      }
       else
+      {
         worker= prev_worker;
+      }
     }
     else
     {
@@ -247,111 +271,424 @@
   }
 }
 
-void gearman_server_con_free_workers(gearman_server_con_st *con)
+void gearman_server_con_st::free_workers()
 {
-  while (con->worker_list != NULL)
-    gearman_server_worker_free(con->worker_list);
+  while (worker_list != NULL)
+  {
+    delete worker_list;
+  }
 }
 
-void gearman_server_con_io_add(gearman_server_con_st *con)
+void gearman_server_con_st::io_add()
 {
-  if (con->io_list)
+  if (io_list)
     return;
 
-  (void) pthread_mutex_lock(&con->thread->lock);
+  thread->lock.lock();
 
-  GEARMAN_LIST_ADD(con->thread->io, con, io_)
-  con->io_list= true;
+  GEARMAN_LIST_ADD(thread->io, this, io_)
+  io_list= true;
 
   /* Looks funny, but need to check io_count locked, but call run unlocked. */
-  if (con->thread->io_count == 1 && con->thread->run_fn)
+  if (thread->io_count == 1 && thread->run_fn)
   {
-    (void) pthread_mutex_unlock(&con->thread->lock);
-    (*con->thread->run_fn)(con->thread, con->thread->run_fn_arg);
+    thread->lock.unlock();
+    (*thread->run_fn)(thread, thread->run_fn_arg);
   }
   else
   {
-    (void) pthread_mutex_unlock(&con->thread->lock);
+    thread->lock.unlock();
   }
 }
 
-void gearman_server_con_io_remove(gearman_server_con_st *con)
+void gearman_server_con_st::io_remove()
 {
-  (void) pthread_mutex_lock(&con->thread->lock);
-  if (con->io_list)
+  boost::mutex::scoped_lock l(thread->lock);
+  if (io_list)
   {
-    GEARMAN_LIST_DEL(con->thread->io, con, io_)
-    con->io_list= false;
+    GEARMAN_LIST_DEL(thread->io, this, io_)
+    io_list= false;
   }
-  (void) pthread_mutex_unlock(&con->thread->lock);
-}
-
-gearman_server_con_st *
-gearman_server_con_io_next(gearman_server_thread_st *thread)
-{
-  gearman_server_con_st *con= thread->io_list;
-
-  if (con == NULL)
-    return NULL;
-
-  gearman_server_con_io_remove(con);
-
-  return con;
-}
-
-void gearman_server_con_proc_add(gearman_server_con_st *con)
-{
-  if (con->proc_list)
+}
+
+void gearman_server_con_st::proc_add()
+{
+  if (proc_list)
     return;
 
-  (void) pthread_mutex_lock(&con->thread->lock);
-  GEARMAN_LIST_ADD(con->thread->proc, con, proc_)
-  con->proc_list= true;
-  (void) pthread_mutex_unlock(&con->thread->lock);
-
-  if (! (con->thread->server->proc_shutdown) &&
-      !(con->thread->server->proc_wakeup))
-  {
-    (void) pthread_mutex_lock(&(con->thread->server->proc_lock));
-    con->thread->server->proc_wakeup= true;
-    (void) pthread_cond_signal(&(con->thread->server->proc_cond));
-    (void) pthread_mutex_unlock(&(con->thread->server->proc_lock));
-  }
-}
-
-void gearman_server_con_proc_remove(gearman_server_con_st *con)
-{
-  (void) pthread_mutex_lock(&con->thread->lock);
-
-  if (con->proc_list)
-  {
-    GEARMAN_LIST_DEL(con->thread->proc, con, proc_)
-    con->proc_list= false;
-  }
-  (void) pthread_mutex_unlock(&con->thread->lock);
-}
-
-gearman_server_con_st *
-gearman_server_con_proc_next(gearman_server_thread_st *thread)
-{
-  gearman_server_con_st *con;
-
-  if (thread->proc_list == NULL)
-    return NULL;
-
-  (void) pthread_mutex_lock(&thread->lock);
-
-  con= thread->proc_list;
-  while (con != NULL)
-  {
-    GEARMAN_LIST_DEL(thread->proc, con, proc_)
-    con->proc_list= false;
-    if (!(con->proc_removed))
-      break;
-    con= thread->proc_list;
-  }
-
-  (void) pthread_mutex_unlock(&thread->lock);
-
-  return con;
+  {
+    boost::mutex::scoped_lock l(thread->lock);
+    GEARMAN_LIST_ADD(thread->proc, this, proc_);
+    proc_list= true;
+  }
+
+  if (! (thread->server->proc_shutdown) &&
+      !(thread->server->proc_wakeup))
+  {
+
+    // Rethink this (copied from straight pthread)
+    boost::mutex::scoped_lock l(thread->server->proc_lock);
+    thread->server->proc_wakeup= true;
+    thread->server->proc_cond.notify_all();
+  }
+}
+
+void gearman_server_con_st::proc_remove()
+{
+  boost::mutex::scoped_lock l(thread->lock);
+
+  if (proc_list)
+  {
+    GEARMAN_LIST_DEL(thread->proc, this, proc_)
+    proc_list= false;
+  }
+}
+
+gearman_server_client_st *gearman_server_con_st::client_create()
+{
+  gearman_server_client_st *client;
+
+  {
+    client= new gearman_server_client_st;
+    if (client == NULL)
+    {
+      Log::Instance()->error("gearman_server_client_create: new()");
+
+      return NULL;
+    }
+  }
+
+  client->con= this;
+  GEARMAN_LIST_ADD(client, client, con_)
+
+    return client;
+}
+
+gearman_server_client_st *gearman_server_con_st::client_add()
+{
+  gearman_server_client_st *client;
+
+  client= client_create();
+  if (client == NULL)
+    return NULL;
+
+  return client;
+}
+
+ 
+gearman_server_worker_st *
+gearman_server_con_st::worker_create(gearman_server_function_st *function)
+{
+  gearman_server_worker_st *worker= NULL;
+
+  worker= new gearman_server_worker_st(this, function);
+
+  GEARMAN_LIST_ADD(worker, worker, con_);
+
+  Log::Instance()->event(Logger::WORKER_CREATED, NULL);
+
+  /* Add worker to the function list, which is a double-linked circular list. */
+  if (function->worker_list == NULL)
+  {
+    function->worker_list= worker;
+    worker->function_next= worker;
+    worker->function_prev= worker;
+  }
+  else
+  {
+    worker->function_next= function->worker_list;
+    worker->function_prev= function->worker_list->function_prev;
+    worker->function_next->function_prev= worker;
+    worker->function_prev->function_next= worker;
+  }
+  function->worker_count++;
+
+  return worker;
+}
+
+gearman_server_worker_st *
+gearman_server_con_st::worker_add(const char *function_name_arg, size_t length, uint32_t timeout)
+{
+  std::string function_name(function_name_arg, length);
+  gearman_server_worker_st *worker;
+  gearman_server_function_st *function;
+
+  if (function_name.empty())
+    return NULL;
+
+  function= thread->server->function_get(function_name);
+
+  if (function == NULL)
+    return NULL;
+
+  worker= worker_create(function);
+  if (worker == NULL)
+    return NULL;
+
+  worker->set_timeout(timeout);
+
+  return worker;
+}
+
+
+gearman_server_job_st *gearman_server_con_st::job_peek()
+{
+  gearman_server_worker_st *server_worker;
+
+  for (server_worker= worker_list; server_worker != NULL;
+       server_worker= server_worker->con_next)
+  {
+    if (server_worker->function->job_count != 0)
+    {
+      for (uint32_t priority= GEARMAN_JOB_PRIORITY_HIGH;
+           priority != GEARMAN_JOB_PRIORITY_MAX; priority++)
+      {
+        if (server_worker->function->job_list[priority] != NULL)
+        {
+          if (server_worker->function->job_list[priority]->ignore_job())
+          {
+            /* This is only happens when a client disconnects from a foreground
+              job. We do this because we don't want to run the job anymore. */
+            server_worker->function->job_list[priority]->set_ignore_job(false);
+
+            delete job_take();
+
+            return job_peek();
+          }
+          return server_worker->function->job_list[priority];
+        }
+      }
+    }
+  }
+
+  return NULL;
+}
+
+/**
+ * Appends a worker onto the end of a list of workers.
+ */
+static inline void _server_con_worker_list_append(gearman_server_worker_st *list,
+                                                  gearman_server_worker_st *worker)
+{
+  worker->con_prev= NULL;
+  worker->con_next= list;
+  while (worker->con_next != NULL)
+  {
+    worker->con_prev= worker->con_next;
+    worker->con_next= worker->con_next->con_next;
+  }
+  if (worker->con_prev)
+    worker->con_prev->con_next= worker;
+}
+
+
+gearman_server_job_st *gearman_server_con_st::job_take()
+{
+  gearman_server_worker_st *server_worker;
+  gearman_server_job_st *server_job;
+  gearman_job_priority_t priority;
+
+  for (server_worker= worker_list; server_worker != NULL;
+       server_worker= server_worker->con_next)
+  {
+    if (server_worker->function->job_count != 0)
+      break;
+  }
+
+  if (server_worker == NULL)
+    return NULL;
+
+  if (thread->server->flags.round_robin)
+  {
+    GEARMAN_LIST_DEL(worker, server_worker, con_)
+    _server_con_worker_list_append(worker_list, server_worker);
+    ++worker_count;
+    if (worker_list == NULL) 
+    {
+      worker_list= server_worker;
+    }
+  }
+
+  uint32_t x;
+  for (x= (uint32_t)GEARMAN_JOB_PRIORITY_HIGH; x != GEARMAN_JOB_PRIORITY_MAX; x++)
+  {
+    if (server_worker->function->job_list[x] != NULL)
+      break;
+  }
+  priority= (gearman_job_priority_t)x;
+
+  server_job= server_worker->function->job_list[priority];
+  server_job->function->job_list[priority]= server_job->function_next;
+  if (server_job->function->job_end[priority] == server_job)
+    server_job->function->job_end[priority]= NULL;
+  server_job->function->job_count--;
+
+  server_job->worker= server_worker;
+  server_worker->add_job(server_job);
+  server_job->function->job_running++;
+
+  if (server_job->ignore_job())
+  {
+    delete server_job;
+    return job_take();
+  }
+
+  return server_job;
+}
+
+gearman_return_t gearman_server_con_st::_server_error_packet(const char *error_code, const char *error_string)
+{
+  return io_packet_add(false, GEARMAN_MAGIC_RESPONSE,
+                       GEARMAN_COMMAND_ERROR, error_code,
+                       (size_t)(strlen(error_code) + 1),
+                       error_string,
+                       (size_t)strlen(error_string), NULL);
+}
+
+
+gearman_return_t gearman_server_con_st::_thread_packet_read()
+{
+  gearman_return_t rc;
+  gearman_server_con_st *con_this= this;
+
+  while (1)
+  {
+    if (con_this->packet == NULL)
+    {
+      con_this->packet= new gearman_server_packet_st;
+      if (con_this->packet == NULL)
+        return GEARMAN_MEMORY_ALLOCATION_FAILURE;
+    }
+
+    (void)gearman_connection_recv(con_this->con(), &(con_this->packet->packet), &rc, true);
+    if (rc != GEARMAN_SUCCESS)
+    {
+      if (rc == GEARMAN_IO_WAIT)
+        break;
+
+      delete con_this->packet;
+      con_this->packet= NULL;
+      return rc;
+    }
+
+    Log::Instance()->debug("%15s:%5s Received  %s",
+                           con_this->_host == NULL ? "-" : con_this->_host,
+                           con_this->_port == NULL ? "-" : con_this->_port,
+                           gearman_command_info_list[con_this->packet->packet.command].name);
+
+    /* We read a complete packet. */
+    if (con_this->thread->server->flags.threaded)
+    {
+      /* Multi-threaded, queue for the processing thread to run. */
+      con_this->gearman_server_proc_packet_add(con_this->packet);
+      con_this->packet= NULL;
+    }
+    else
+    {
+      /* Single threaded, run the command here. */
+      rc= gearman_server_run_command(con_this, &(con_this->packet->packet));
+      delete con_this->packet;
+      con_this->packet= NULL;
+      if (rc != GEARMAN_SUCCESS)
+        return rc;
+    }
+  }
+
+  return GEARMAN_SUCCESS;
+}
+
+gearman_return_t gearman_server_con_st::io_packet_add(bool take_data,
+                                                      enum gearman_magic_t magic,
+                                                      gearman_command_t command,
+                                                      const void *arg, ...)
+{
+  gearman_server_packet_st *server_packet;
+  va_list ap;
+  size_t arg_size;
+  gearman_return_t rc;
+
+  server_packet= new gearman_server_packet_st(thread->gearman, magic, command);
+  if (server_packet == NULL)
+    return GEARMAN_MEMORY_ALLOCATION_FAILURE;
+
+  va_start(ap, arg);
+
+  while (arg != NULL)
+  {
+    arg_size = va_arg(ap, size_t);
+
+    rc= gearman_packet_create_arg(&(server_packet->packet), arg, arg_size);
+    if (rc != GEARMAN_SUCCESS)
+    {
+      va_end(ap);
+      delete server_packet;
+
+      return rc;
+    }
+
+    arg = va_arg(ap, void *);
+  }
+
+  va_end(ap);
+
+  rc= gearman_packet_pack_header(&(server_packet->packet));
+  if (rc != GEARMAN_SUCCESS)
+  {
+    delete server_packet;
+
+    return rc;
+  }
+
+  if (take_data)
+  {
+    server_packet->packet.options.free_data= true;
+  }
+
+  {
+    boost::mutex::scoped_lock l(thread->lock);
+    io_packet_list.push(server_packet);
+  }
+
+  io_add();
+
+  return GEARMAN_SUCCESS;
+}
+
+void gearman_server_con_st::io_packet_remove()
+{
+  gearman_server_packet_st *server_packet;
+  {
+    boost::mutex::scoped_lock l(thread->lock);
+    server_packet= io_packet_list.front();
+    io_packet_list.pop();
+    assert(server_packet);
+  }
+
+  delete server_packet;
+}
+
+void gearman_server_con_st::gearman_server_proc_packet_add(gearman_server_packet_st *arg)
+{
+  {
+    boost::mutex::scoped_lock l(thread->lock);
+    proc_packet_list.push(arg);
+  }
+
+  proc_add();
+}
+
+gearman_server_packet_st *gearman_server_con_st::proc_packet_remove()
+{
+  if (proc_packet_list.size() == 0)
+    return NULL;
+
+  gearman_server_packet_st *server_packet;
+  {
+    boost::mutex::scoped_lock l(thread->lock);
+    server_packet= proc_packet_list.front();
+    proc_packet_list.pop();
+    assert(server_packet);
+  }
+
+  return server_packet;
 }

=== modified file 'libgearman-server/connection.h'
--- libgearman-server/connection.h	2010-04-06 16:34:30 +0000
+++ libgearman-server/connection.h	2010-07-01 01:31:26 +0000
@@ -1,4 +1,5 @@
 /* Gearman server and library
+ * Copyright (C) 2010 Data Differential
  * Copyright (C) 2008 Brian Aker, Eric Day
  * All rights reserved.
  *
@@ -14,9 +15,7 @@
 #ifndef __GEARMAN_SERVER_CON_H__
 #define __GEARMAN_SERVER_CON_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <queue>
 
 /**
  * @addtogroup gearman_server_con Connection Declarations
@@ -28,9 +27,11 @@
  * @{
  */
 
+typedef std::queue<gearman_server_packet_st *> ProcPacketList;
+
 struct gearman_server_con_st
 {
-  gearman_connection_st con; /* This must be the first struct member. */
+  gearman_connection_st _con; /* This must be the first struct member. */
   bool is_sleeping;
   bool is_exceptions;
   bool is_dead;
@@ -39,166 +40,158 @@
   bool io_list;
   bool proc_list;
   bool proc_removed;
-  uint32_t io_packet_count;
-  uint32_t proc_packet_count;
   uint32_t worker_count;
   uint32_t client_count;
   gearman_server_thread_st *thread;
-  gearman_server_con_st *next;
-  gearman_server_con_st *prev;
   gearman_server_packet_st *packet;
-  gearman_server_packet_st *io_packet_list;
-  gearman_server_packet_st *io_packet_end;
-  gearman_server_packet_st *proc_packet_list;
-  gearman_server_packet_st *proc_packet_end;
+  ProcPacketList io_packet_list;
+  ProcPacketList proc_packet_list;
   gearman_server_con_st *io_next;
   gearman_server_con_st *io_prev;
   gearman_server_con_st *proc_next;
   gearman_server_con_st *proc_prev;
   gearman_server_worker_st *worker_list;
   gearman_server_client_st *client_list;
-  const char *host;
-  const char *port;
-  char id[GEARMAN_SERVER_CON_ID_SIZE];
+  const char *_host;
+  const char *_port;
+  char _id[GEARMAN_SERVER_CON_ID_SIZE];
+
+  gearman_server_con_st(gearman_server_thread_st *thread_arg);
+  ~gearman_server_con_st();
+
+  void free_workers();
+public:
+  gearman_server_client_st *client_create();
+  gearman_server_client_st *client_add();
+
+  gearman_return_t _server_run_text(gearman_packet_st *packet);
+
+  /**
+   * Remove connection from the io thread list.
+ */
+  void io_remove();
+
+  /**
+   * Add connection to the proc thread list.
+ */
+  void proc_add();
+
+  gearman_server_packet_st *proc_packet_remove();
+
+  /**
+   * Remove the first server packet structure from io queue for a connection.
+ */
+  void io_packet_remove();
+
+  /**
+   * Remove connection from the proc thread list.
+ */
+  void proc_remove();
+
+  /**
+   * Get gearman connection pointer the server connection uses.
+   */
+  gearman_connection_st *con()
+  {
+    return &_con;
+  }
+
+  /**
+   * Set client id.
+   */
+  void set_id(char *id_arg, size_t size);
+
+  /**
+   * Set client port.
+   */
+  void set_port(const char *port);
+
+  /**
+   * Set client host.
+   */
+  void set_host(const char *host_arg);
+
+  /**
+   * Get client host.
+   */
+  const char *host()
+  {
+    return _host;
+  }
+
+  /**
+   * Get client port.
+   */
+  const char *port()
+  {
+    return _port;
+  }
+
+  /**
+   * Get client id.
+   */
+  const char *id()
+  {
+    return _id;
+  }
+
+  /**
+   * Get application data pointer.
+   */
+  const void *data();
+
+  /**
+   * Add connection to the io thread list.
+   */
+  void io_add();
+
+  /**
+   * Free server worker struction with name for a server connection.
+   */
+  void free_worker(const char *function_name_arg,
+                   size_t function_name_size_arg);
+
+  /**
+   * Add a server packet structure to io queue for a connection.
+   */
+  gearman_return_t io_packet_add(bool take_data,
+                                 enum gearman_magic_t magic,
+                                 gearman_command_t command,
+                                 const void *arg, ...);
+
+  /**
+   * Add a new worker to a server instance.
+   */
+  gearman_server_worker_st *
+    worker_add(const char *function_name, size_t function_name_size, uint32_t timeout);
+
+  gearman_server_worker_st *
+    worker_create(gearman_server_function_st *function);
+
+  /**
+   * See if there are any jobs to be run for the server worker connection.
+   */
+  gearman_server_job_st *job_peek();
+
+  /**
+   * Start running a job for the server worker connection.
+   */
+  gearman_server_job_st *job_take();
+
+  gearman_return_t _thread_packet_read();
+
+/**
+ * Remove the first server packet structure from proc queue for a connection.
+ */
+
+  gearman_return_t _server_error_packet(const char *error_code, const char *error_string);
+
+  /**
+   * Add a server packet structure to proc queue for a connection.
+   */
+  void gearman_server_proc_packet_add(gearman_server_packet_st *packet);
 };
 
-/**
- * Add a connection to a server thread. This goes into a list of connections
- * that is used later with server_thread_run, no socket I/O happens here.
- * @param thread Thread structure previously initialized with
- *        gearman_server_thread_create.
- * @param fd File descriptor for a newly accepted connection.
- * @param data Application data pointer.
- * @return Gearman server connection pointer.
- */
-GEARMAN_API
-gearman_server_con_st *gearman_server_con_add(gearman_server_thread_st *thread,
-                                              int fd, void *data);
-
-/**
- * Initialize a server connection structure.
- */
-GEARMAN_API
-gearman_server_con_st *
-gearman_server_con_create(gearman_server_thread_st *thread);
-
-/**
- * Free a server connection structure.
- */
-GEARMAN_API
-void gearman_server_con_free(gearman_server_con_st *con);
-
-/**
- * Get gearman connection pointer the server connection uses.
- */
-GEARMAN_API
-gearman_connection_st *gearman_server_con_con(gearman_server_con_st *con);
-
-/**
- * Get application data pointer.
- */
-GEARMAN_API
-const void *gearman_server_con_data(const gearman_server_con_st *con);
-
-/**
- * Set application data pointer.
- */
-GEARMAN_API
-void gearman_server_con_set_data(gearman_server_con_st *con, void *data);
-
-/**
- * Get client host.
- */
-GEARMAN_API
-const char *gearman_server_con_host(gearman_server_con_st *con);
-
-/**
- * Set client host.
- */
-GEARMAN_API
-void gearman_server_con_set_host(gearman_server_con_st *con, const char *host);
-
-/**
- * Get client port.
- */
-GEARMAN_API
-const char *gearman_server_con_port(gearman_server_con_st *con);
-
-/**
- * Set client port.
- */
-GEARMAN_API
-void gearman_server_con_set_port(gearman_server_con_st *con, const char *port);
-
-/**
- * Get client id.
- */
-GEARMAN_API
-const char *gearman_server_con_id(gearman_server_con_st *con);
-
-/**
- * Set client id.
- */
-GEARMAN_API
-void gearman_server_con_set_id(gearman_server_con_st *con, char *id,
-                               size_t size);
-
-/**
- * Free server worker struction with name for a server connection.
- */
-GEARMAN_API
-void gearman_server_con_free_worker(gearman_server_con_st *con,
-                                    char *function_name,
-                                    size_t function_name_size);
-
-/**
- * Free all server worker structures for a server connection.
- */
-GEARMAN_API
-void gearman_server_con_free_workers(gearman_server_con_st *con);
-
-/**
- * Add connection to the io thread list.
- */
-GEARMAN_API
-void gearman_server_con_io_add(gearman_server_con_st *con);
-
-/**
- * Remove connection from the io thread list.
- */
-GEARMAN_API
-void gearman_server_con_io_remove(gearman_server_con_st *con);
-
-/**
- * Get next connection from the io thread list.
- */
-GEARMAN_API
-gearman_server_con_st *
-gearman_server_con_io_next(gearman_server_thread_st *thread);
-
-/**
- * Add connection to the proc thread list.
- */
-GEARMAN_API
-void gearman_server_con_proc_add(gearman_server_con_st *con);
-
-/**
- * Remove connection from the proc thread list.
- */
-GEARMAN_API
-void gearman_server_con_proc_remove(gearman_server_con_st *con);
-
-/**
- * Get next connection from the proc thread list.
- */
-GEARMAN_API
-gearman_server_con_st *
-gearman_server_con_proc_next(gearman_server_thread_st *thread);
-
 /** @} */
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* __GEARMAN_SERVER_CON_H__ */

=== modified file 'libgearman-server/constants.h'
--- libgearman-server/constants.h	2010-04-06 19:40:28 +0000
+++ libgearman-server/constants.h	2010-07-01 01:31:26 +0000
@@ -1,4 +1,5 @@
 /* Gearman server and library
+ * Copyright (C) 2010 Data Differential
  * Copyright (C) 2008 Brian Aker, Eric Day
  * All rights reserved.
  *
@@ -14,10 +15,6 @@
 #ifndef __GEARMAN_SERVER_CONSTANTS_H__
 #define __GEARMAN_SERVER_CONSTANTS_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
  * @addtogroup gearman_server_constants Constants
  * @ingroup gearman_server
@@ -70,13 +67,13 @@
 typedef struct gearman_server_client_st gearman_server_client_st;
 typedef struct gearman_server_worker_st gearman_server_worker_st;
 typedef struct gearman_server_job_st gearman_server_job_st;
-typedef struct gearmand_st gearmand_st;
 typedef struct gearmand_port_st gearmand_port_st;
 typedef struct gearmand_con_st gearmand_con_st;
 typedef struct gearmand_thread_st gearmand_thread_st;
 typedef struct gearman_conf_st gearman_conf_st;
 typedef struct gearman_conf_option_st gearman_conf_option_st;
 typedef struct gearman_conf_module_st gearman_conf_module_st;
+struct gearmand_st;
 
 /* Function types. */
 typedef void (gearman_server_thread_run_fn)(gearman_server_thread_st *thread,
@@ -91,35 +88,9 @@
                                                 const void *data,
                                                 size_t data_size,
                                                gearman_job_priority_t priority);
-typedef gearman_return_t (gearman_queue_flush_fn)(gearman_server_st *server,
-                                                  void *context);
-typedef gearman_return_t (gearman_queue_done_fn)(gearman_server_st *server,
-                                                 void *context,
-                                                 const void *unique,
-                                                 size_t unique_size,
-                                                 const void *function_name,
-                                                 size_t function_name_size);
-typedef gearman_return_t (gearman_queue_replay_fn)(gearman_server_st *server,
-                                                   void *context,
-                                                   gearman_queue_add_fn *add_fn,
-                                                   void *add_context);
 
 typedef gearman_return_t (gearman_connection_add_fn)(gearman_connection_st *con);
 
 /** @} */
 
-/**
- * @addtogroup gearman_server_protocol Protocol Plugins
- * @ingroup gearman_server
- */
-
-/**
- * @addtogroup gearman_server_queue Queue Plugins
- * @ingroup gearman_server
- */
-
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* __GEARMAN_SERVER_CONSTANTS_H__ */

=== renamed file 'libgearman-server/function.c' => 'libgearman-server/function.cc'
--- libgearman-server/function.c	2010-04-06 21:41:46 +0000
+++ libgearman-server/function.cc	2010-07-01 01:31:26 +0000
@@ -1,4 +1,5 @@
 /* Gearman server and library
+ * Copyright (C) 2010 Data Differential
  * Copyright (C) 2008 Brian Aker, Eric Day
  * All rights reserved.
  *
@@ -11,33 +12,55 @@
  * @brief Server function definitions
  */
 
-#include "common.h"
+#include "libgearman-server/common.h"
 
 /*
  * Public definitions
  */
 
+gearman_server_function_st::gearman_server_function_st(gearman_server_st *server_arg,
+                                                       const std::string &function_name_arg) :
+  worker_count(0),
+  job_count(0),
+  job_total(0),
+  job_running(0),
+  max_queue_size(GEARMAN_DEFAULT_MAX_QUEUE_SIZE),
+  server(server_arg),
+  next(NULL),
+  prev(NULL),
+  function_name(function_name_arg),
+  worker_list(NULL)
+{
+  memset(job_list, 0, sizeof(gearman_server_job_st *) * GEARMAN_JOB_PRIORITY_MAX);
+  memset(job_end, 0, sizeof(gearman_server_job_st *) * GEARMAN_JOB_PRIORITY_MAX);
+}
+
+gearman_server_function_st::~gearman_server_function_st()
+{
+}
+
 gearman_server_function_st *
-gearman_server_function_get(gearman_server_st *server,
-                            const char *function_name,
-                            size_t function_name_size)
+gearman_server_st::function_get(const std::string &function_name_arg)
 {
   gearman_server_function_st *function;
 
-  for (function= server->function_list; function != NULL;
+  if (function_name_arg.empty())
+    return NULL;
+
+  for (function= function_list; function != NULL;
        function= function->next)
   {
-    if (function->function_name_size == function_name_size &&
-        !memcmp(function->function_name, function_name, function_name_size))
+    if (not function->function_name.compare(function_name_arg))
     {
       return function;
     }
   }
 
-  function= gearman_server_function_create(server, NULL);
+  function= gearman_server_function_create(this, function_name_arg);
   if (function == NULL)
     return NULL;
 
+<<<<<<< TREE
   function->function_name= (char *)malloc(function_name_size + 1);
   if (function->function_name == NULL)
   {
@@ -49,13 +72,15 @@
   function->function_name[function_name_size]= 0;
   function->function_name_size= function_name_size;
 
+=======
+>>>>>>> MERGE-SOURCE
   return function;
 }
 
-gearman_server_function_st *
-gearman_server_function_create(gearman_server_st *server,
-                               gearman_server_function_st *function)
+gearman_server_function_st *gearman_server_function_create(gearman_server_st *server,
+                                                           const std::string &function_name)
 {
+<<<<<<< TREE
   if (function == NULL)
   {
     function= (gearman_server_function_st *)malloc(sizeof(gearman_server_function_st));
@@ -76,24 +101,20 @@
   function->max_queue_size= GEARMAN_DEFAULT_MAX_QUEUE_SIZE;
   function->function_name_size= 0;
   function->server= server;
+=======
+  gearman_server_function_st *function;
+
+  function= new gearman_server_function_st(server, function_name);
+
+>>>>>>> MERGE-SOURCE
   GEARMAN_LIST_ADD(server->function, function,)
-  function->function_name= NULL;
-  function->worker_list= NULL;
-  memset(function->job_list, 0,
-         sizeof(gearman_server_job_st *) * GEARMAN_JOB_PRIORITY_MAX);
-  memset(function->job_end, 0,
-         sizeof(gearman_server_job_st *) * GEARMAN_JOB_PRIORITY_MAX);
 
   return function;
 }
 
 void gearman_server_function_free(gearman_server_function_st *function)
 {
-  if (function->function_name != NULL)
-    free(function->function_name);
-
-  GEARMAN_LIST_DEL(function->server->function, function,)
-
-  if (function->options.allocated)
-    free(function);
+  GEARMAN_LIST_DEL(function->server->function, function,);
+
+  delete function;
 }

=== modified file 'libgearman-server/function.h'
--- libgearman-server/function.h	2010-03-11 19:52:09 +0000
+++ libgearman-server/function.h	2010-07-01 01:31:26 +0000
@@ -1,4 +1,5 @@
 /* Gearman server and library
+ * Copyright (C) 2010 Data Differential
  * Copyright (C) 2008 Brian Aker, Eric Day
  * All rights reserved.
  *
@@ -14,9 +15,7 @@
 #ifndef __GEARMAN_SERVER_FUNCTION_H__
 #define __GEARMAN_SERVER_FUNCTION_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <string>
 
 /**
  * @addtogroup gearman_server_function Function Declarations
@@ -41,32 +40,24 @@
   uint32_t job_total;
   uint32_t job_running;
   uint32_t max_queue_size;
-  size_t function_name_size;
   gearman_server_st *server;
   gearman_server_function_st *next;
   gearman_server_function_st *prev;
-  char *function_name;
+  std::string function_name;
   gearman_server_worker_st *worker_list;
   gearman_server_job_st *job_list[GEARMAN_JOB_PRIORITY_MAX];
   gearman_server_job_st *job_end[GEARMAN_JOB_PRIORITY_MAX];
+
+  gearman_server_function_st(gearman_server_st *server, const std::string &function_name_arg);
+  ~gearman_server_function_st();
 };
 
 /**
- * Add a new function to a server instance.
- */
-GEARMAN_API
-gearman_server_function_st *
-gearman_server_function_get(gearman_server_st *server,
-                            const char *function_name,
-                            size_t function_name_size);
-
-/**
  * Initialize a server function structure.
  */
 GEARMAN_API
 gearman_server_function_st *
-gearman_server_function_create(gearman_server_st *server,
-                               gearman_server_function_st *function);
+gearman_server_function_create(gearman_server_st *server, const std::string &function_name_arg);
 
 /**
  * Free a server function structure.
@@ -76,8 +67,4 @@
 
 /** @} */
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* __GEARMAN_SERVER_FUNCTION_H__ */

=== renamed file 'libgearman-server/gearmand.c' => 'libgearman-server/gearmand.cc'
--- libgearman-server/gearmand.c	2010-04-06 21:41:46 +0000
+++ libgearman-server/gearmand.cc	2010-07-01 01:31:26 +0000
@@ -1,4 +1,5 @@
 /* Gearman server and library
+ * Copyright (C) 2010 Data Differential
  * Copyright (C) 2008 Brian Aker, Eric Day
  * All rights reserved.
  *
@@ -11,43 +12,14 @@
  * @brief Gearmand Definitions
  */
 
-#include "common.h"
+#include "libgearman-server/common.h"
 #include "gearmand.h"
 
 /*
- * Private declarations
- */
-
-/**
- * @addtogroup gearmand_private Private Gearman Daemon Functions
- * @ingroup gearmand
- * @{
- */
-
-static void _log(const char *line, gearman_verbose_t verbose, void *context);
-
-static gearman_return_t _listen_init(gearmand_st *gearmand);
-static void _listen_close(gearmand_st *gearmand);
-static gearman_return_t _listen_watch(gearmand_st *gearmand);
-static void _listen_clear(gearmand_st *gearmand);
-static void _listen_event(int fd, short events, void *arg);
-
-static gearman_return_t _wakeup_init(gearmand_st *gearmand);
-static void _wakeup_close(gearmand_st *gearmand);
-static gearman_return_t _wakeup_watch(gearmand_st *gearmand);
-static void _wakeup_clear(gearmand_st *gearmand);
-static void _wakeup_event(int fd, short events, void *arg);
-
-static gearman_return_t _watch_events(gearmand_st *gearmand);
-static void _clear_events(gearmand_st *gearmand);
-static void _close_events(gearmand_st *gearmand);
-
-/** @} */
-
-/*
  * Public definitions
  */
 
+<<<<<<< TREE
 gearmand_st *gearmand_create(const char *host, in_port_t port)
 {
   gearmand_st *gearmand;
@@ -82,10 +54,33 @@
   gearmand->thread_list= NULL;
   gearmand->thread_add_next= NULL;
   gearmand->free_dcon_list= NULL;
+=======
+static in_port_t global_port= 0;
+
+in_port_t libgearmand_server_port()
+{
+  return global_port;
+}
+
+gearmand_st::gearmand_st(const char *host_arg,
+                         in_port_t port,
+                         uint32_t threads_arg) :
+  ret(GEARMAN_SUCCESS),
+  backlog(0),
+  is_listen_event(false),
+  threads(threads_arg),
+  host(0),
+  base(0),
+  port_list(0),
+  thread_add_next(0)
+{
+  host= host_arg;
+>>>>>>> MERGE-SOURCE
 
   if (port == 0)
     port= GEARMAN_DEFAULT_TCP_PORT;
 
+<<<<<<< TREE
   if (gearmand_port_add(gearmand, port, NULL) != GEARMAN_SUCCESS)
   {
     gearmand_free(gearmand);
@@ -188,109 +183,137 @@
 
   gearmand->port_list= port_list;
   gearmand->port_count++;
+=======
+  global_port= port;
+
+  port_add(port);
+}
+
+gearmand_st::~gearmand_st()
+{
+  _close_events();
+
+  Log::Instance()->info("Stopping Services");
+
+  Services::Instance()->stop();
+
+  thread_add_next= thread_list.end();
+
+  if (thread_list.size())
+  {
+    Log::Instance()->info("Shutting down all threads");
+  }
+  for (std::vector<ThreadPtr>::iterator iter= thread_list.begin();
+       iter != thread_list.end();
+       iter++)
+  {
+    delete *iter;
+  }
+  thread_list.clear();
+
+  if (base != NULL)
+    event_base_free(base);
+
+  port_list.clear();
+
+  Log::Instance()->info("Shutdown complete");
+}
+
+gearman_return_t gearmand_st::port_add(in_port_t port,
+                                       gearman_connection_add_fn *function,
+                                       Protocol *protocol)
+{
+  PortPtr new_port(new gearmand_port_st(this, port, function, protocol));
+
+  port_list.push_back(new_port);
+>>>>>>> MERGE-SOURCE
 
   return GEARMAN_SUCCESS;
 }
 
-gearman_return_t gearmand_run(gearmand_st *gearmand)
+gearman_return_t gearmand_st::run()
 {
-  uint32_t x;
 
   /* Initialize server components. */
-  if (gearmand->base == NULL)
+  if (base == NULL)
   {
-    gearmand_log_info(gearmand, "Starting up");
+    Log::Instance()->info("Starting up");
 
-    if (gearmand->threads > 0)
+    if (threads > 0)
     {
 #ifndef HAVE_EVENT_BASE_NEW
-      gearmand_log_fatal(gearmand, "Multi-threaded gearmand requires libevent 1.4 or later, libevent 1.3 does not provided a "
-                         "thread-safe interface.");
+      Log::Instance()->fatal("Multi-threaded gearmand requires libevent 1.4 or later, libevent 1.3 does not provided a "
+                             "thread-safe interface.");
       return GEARMAN_EVENT;
-#else
-      /* Set the number of free connection structures each thread should keep
-         around before the main thread is forced to take them. We compute this
-         here so we don't need to on every new connection. */
-      gearmand->max_thread_free_dcon_count= ((GEARMAN_MAX_FREE_SERVER_CON /
-                                              gearmand->threads) / 2);
 #endif
     }
 
-    gearmand_log_debug(gearmand, "Initializing libevent for main thread");
+    Log::Instance()->debug("Initializing libevent for main thread");
 
-    gearmand->base= event_base_new();
-    if (gearmand->base == NULL)
+    base= event_base_new();
+    if (base == NULL)
     {
-      gearmand_log_fatal(gearmand, "gearmand_run:event_base_new:NULL");
+      Log::Instance()->fatal("gearmand_run:event_base_new:NULL");
       return GEARMAN_EVENT;
     }
 
-    gearmand_log_debug(gearmand, "Method for libevent: %s",
-                       event_base_get_method(gearmand->base));
-
-    gearmand->ret= _listen_init(gearmand);
-    if (gearmand->ret != GEARMAN_SUCCESS)
-      return gearmand->ret;
-
-    gearmand->ret= _wakeup_init(gearmand);
-    if (gearmand->ret != GEARMAN_SUCCESS)
-      return gearmand->ret;
-
-    gearmand_log_debug(gearmand, "Creating %u threads", gearmand->threads);
+    Log::Instance()->debug("Method for libevent: %s", event_base_get_method(base));
+
+    ret= _listen_init();
+    if (ret != GEARMAN_SUCCESS)
+      return ret;
+
+    ret= _wakeup_init(base);
+    if (ret != GEARMAN_SUCCESS)
+      return ret;
+
+    Log::Instance()->debug("Creating %u threads", threads);
 
     /* If we have 0 threads we still need to create a fake one for context. */
-    x= 0;
+    uint32_t x= 0;
     do
     {
-      gearmand->ret= gearmand_thread_create(gearmand);
-      if (gearmand->ret != GEARMAN_SUCCESS)
-        return gearmand->ret;
+      ThreadPtr thread(new gearmand_thread_st(this));
+      thread_list.push_back(thread);
+
+      if (ret != GEARMAN_SUCCESS)
+        return ret;
       x++;
-    }
-    while (x < gearmand->threads);
-
-    gearmand->ret= gearman_server_queue_replay(&(gearmand->server));
-    if (gearmand->ret != GEARMAN_SUCCESS)
-      return gearmand->ret;
+    } while (x < threads);
+
+    thread_add_next= thread_list.end();
+
+    ret= server.queue_replay();
+    if (ret != GEARMAN_SUCCESS)
+      return ret;
   }
 
-  gearmand->ret= _watch_events(gearmand);
-  if (gearmand->ret != GEARMAN_SUCCESS)
-    return gearmand->ret;
-
-  gearmand_log_info(gearmand, "Entering main event loop");
-
-  if (event_base_loop(gearmand->base, 0) == -1)
+  ret= _watch_events();
+  if (ret != GEARMAN_SUCCESS)
+    return ret;
+
+  Log::Instance()->info("Starting Services");
+
+  Services::Instance()->start();
+
+  Log::Instance()->info("Entering main event loop");
+
+  if (event_base_loop(base, 0) == -1)
   {
-    gearmand_log_fatal(gearmand, "gearmand_run:event_base_loop:-1");
+    Log::Instance()->fatal("gearmand_run:event_base_loop:-1");
     return GEARMAN_EVENT;
   }
 
-  gearmand_log_info(gearmand, "Exited main event loop");
-
-  return gearmand->ret;
-}
-
-void gearmand_wakeup(gearmand_st *gearmand, gearmand_wakeup_t wakeup)
-{
-  uint8_t buffer= wakeup;
-
-  /* If this fails, there is not much we can really do. This should never fail
-     though if the main gearmand thread is still active. */
-  if (write(gearmand->wakeup_fd[1], &buffer, 1) != 1)
-    gearmand_log_error(gearmand, "gearmand_wakeup:write:%d", errno);
-}
-
-void gearmand_set_round_robin(gearmand_st *gearmand, bool round_robin)
-{
-  gearmand->server.flags.round_robin= round_robin;
-}
-
+  Log::Instance()->info("Exited main event loop");
+
+  return ret;
+}
 
 /*
  * Private definitions
  */
 
+<<<<<<< TREE
 static void _log(const char *line, gearman_verbose_t verbose, void *context)
 {
   gearmand_st *gearmand= (gearmand_st *)context;
@@ -623,21 +646,86 @@
                           void *arg)
 {
   gearmand_st *gearmand= (gearmand_st *)arg;
+=======
+gearman_return_t gearmand_st::_listen_init()
+{
+  for (std::vector<PortPtr>::iterator iter= port_list.begin();
+       iter != port_list.end(); iter++)
+  {
+    gearman_return_t rc= (*iter)->_listen_init(host, base, backlog);
+
+    if (rc != GEARMAN_SUCCESS)
+      return rc;
+  }
+
+  return GEARMAN_SUCCESS;
+}
+
+void gearmand_st::_listen_close()
+{
+  _listen_clear();
+}
+
+gearman_return_t gearmand_st::_listen_watch()
+{
+  if (is_listen_event)
+    return GEARMAN_SUCCESS;
+
+  for (std::vector<PortPtr>::iterator iter= port_list.begin(); iter != port_list.end(); iter++)
+  {
+
+    gearman_return_t rc= (*iter)->_listen_watch();
+
+    if (rc == GEARMAN_EVENT)
+      return GEARMAN_EVENT;
+  }
+
+  is_listen_event= true;
+  return GEARMAN_SUCCESS;
+}
+
+void gearmand_st::_listen_clear()
+{
+  if (! (is_listen_event))
+    return;
+
+  for (std::vector<PortPtr>::iterator iter= port_list.begin(); iter != port_list.end(); iter++)
+  {
+    (*iter)->_listen_clear();
+  }
+
+  is_listen_event= false;
+}
+
+void gearmand_st::_wake_up_thread_for_shutdown()
+{
+  for (std::vector<ThreadPtr>::iterator iter= thread_list.begin();
+       iter != thread_list.end();
+       iter++)
+  {
+    (*iter)->set_wakeup(GEARMAND_WAKEUP_SHUTDOWN_GRACEFUL);
+  }
+}
+
+void gearmand_st::_wakeup_event(int fd, short events __attribute__ ((unused)))
+{
+  gearmand_st *gearmand= (gearmand_st *)this;
+>>>>>>> MERGE-SOURCE
   uint8_t buffer[GEARMAN_PIPE_BUFFER_SIZE];
-  ssize_t ret;
-  gearmand_thread_st *thread;
 
   while (1)
   {
-    ret= read(fd, buffer, GEARMAN_PIPE_BUFFER_SIZE);
-    if (ret == 0)
+    ssize_t rc;
+    rc= read(fd, buffer, GEARMAN_PIPE_BUFFER_SIZE);
+    if (rc == 0)
     {
-      _clear_events(gearmand);
-      gearmand_log_fatal(gearmand, "_wakeup_event:read:EOF");
+      gearmand->_clear_events();
+      Log::Instance()->fatal("_wakeup_event:read:EOF");
       gearmand->ret= GEARMAN_PIPE_EOF;
+
       return;
     }
-    else if (ret == -1)
+    else if (rc == -1)
     {
       if (errno == EINTR)
         continue;
@@ -645,46 +733,42 @@
       if (errno == EAGAIN)
         break;
 
-      _clear_events(gearmand);
-      gearmand_log_fatal(gearmand, "_wakeup_event:read:%d", errno);
+      gearmand->_clear_events();
+      Log::Instance()->fatal("_wakeup_event:read:%d", errno);
       gearmand->ret= GEARMAN_ERRNO;
       return;
     }
 
-    for (ssize_t x= 0; x < ret; x++)
+    for (ssize_t x= 0; x < rc; x++)
     {
       switch ((gearmand_wakeup_t)buffer[x])
       {
       case GEARMAND_WAKEUP_PAUSE:
-        gearmand_log_info(gearmand, "Received PAUSE wakeup event");
-        _clear_events(gearmand);
+        Log::Instance()->info("Received PAUSE wakeup event");
+        gearmand->_clear_events();
         gearmand->ret= GEARMAN_PAUSE;
         break;
 
       case GEARMAND_WAKEUP_SHUTDOWN_GRACEFUL:
-        gearmand_log_info(gearmand, "Received SHUTDOWN_GRACEFUL wakeup event");
-        _listen_close(gearmand);
+        Log::Instance()->info("Received SHUTDOWN_GRACEFUL wakeup event");
 
-        for (thread= gearmand->thread_list; thread != NULL;
-             thread= thread->next)
-        {
-          gearmand_thread_wakeup(thread, GEARMAND_WAKEUP_SHUTDOWN_GRACEFUL);
-        }
+        gearmand->_listen_close();
+        gearmand->_wake_up_thread_for_shutdown();
 
         gearmand->ret= GEARMAN_SHUTDOWN_GRACEFUL;