Merge lp:~brianaker/gearmand/gearmnan_job_use_client into lp:gearmand

[Brian Aker]

[lp:~brianaker/gearmand/gearmnan_job_use_client]

867. By Brian Aker on 2013-08-30

Fix missing man pages

868. By Brian Aker on 2013-08-30

Fix uuid testing

869. By Brian Aker on 2013-08-30

Fix duplicate man page entry.

870. By Brian Aker on 2013-08-30

Fix docs

871. By Brian Aker on 2013-08-31

Fix spec file.

=== modified file 'ChangeLog'
--- ChangeLog	2013-08-15 06:28:02 +0000
+++ ChangeLog	2013-08-31 03:15:41 +0000
@@ -1,5 +1,5 @@
 1.1.10
-*
+* Added gearman_job_use_client()
 
 1.1.9 Fri Aug  2 02:39:25 EDT 2013
 * Added gearman_task_is_finished()
 
=== modified file 'configure.ac'
--- configure.ac	2013-08-16 08:58:49 +0000
+++ configure.ac	2013-08-31 03:15:41 +0000
@@ -271,6 +271,7 @@
 
 AX_LIBEVENT(,[AC_MSG_ERROR([Unable to find libevent])])
 
+AX_UUID(,[AC_MSG_ERROR([Unable to find libuuid])])
 AX_UUID_GENERATE_TIME_SAFE
 
 AX_AM_JOBSERVER([yes])
 
=== modified file 'docs/conf.py.in'
--- docs/conf.py.in	2013-01-09 16:53:25 +0000
+++ docs/conf.py.in	2013-08-31 03:15:41 +0000
@@ -292,6 +292,7 @@
   ('libgearman/gearman_job_st', 'gearman_job_free_all', u'Gearmand Documentation, http://gearman.info/', [u'Data Differential http://www.datadifferential.com/'], 3),
   ('libgearman/gearman_job_st', 'gearman_job_function_name', u'Gearmand Documentation, http://gearman.info/', [u'Data Differential http://www.datadifferential.com/'], 3),
   ('libgearman/gearman_job_st', 'gearman_job_handle', u'Gearmand Documentation, http://gearman.info/', [u'Data Differential http://www.datadifferential.com/'], 3),
+  ('libgearman/gearman_job_st', 'gearman_job_use_client', u'Gearmand Documentation, http://gearman.info/', [u'Data Differential http://www.datadifferential.com/'], 3),
   ('libgearman/gearman_job_st', 'gearman_job_send_complete', u'Gearmand Documentation, http://gearman.info/', [u'Data Differential http://www.datadifferential.com/'], 3),
   ('libgearman/gearman_job_st', 'gearman_job_send_data', u'Gearmand Documentation, http://gearman.info/', [u'Data Differential http://www.datadifferential.com/'], 3),
   ('libgearman/gearman_job_st', 'gearman_job_send_exception', u'Gearmand Documentation, http://gearman.info/', [u'Data Differential http://www.datadifferential.com/'], 3),
 
=== modified file 'docs/libgearman/gearman_job_st.rst'
--- docs/libgearman/gearman_job_st.rst	2013-08-16 08:41:58 +0000
+++ docs/libgearman/gearman_job_st.rst	2013-08-31 03:15:41 +0000
@@ -36,6 +36,8 @@
 
 .. c:function:: void *gearman_job_take_workload(gearman_job_st *job, size_t *data_size)
 
+.. c:function:: gearman_client_st *gearman_job_use_client(gearman_job_st *job)
+
 Link with -lgearman
 
 -----------
@@ -54,10 +56,13 @@
 
 :c:func:`gearman_job_unique` return the unique value that was used for :c:type:`gearman_job_st`. 
 
-returns the :c:type:`gearman_job_st` workload. The size of it can be determined with :c:func:`gearman_job_workload_size`.
+gearman_job_take_workload returns the :c:type:`gearman_job_st` workload. The size of it can be determined with :c:func:`gearman_job_workload_size`.
 :c:func:`gearman_job_take_workload` is the same as :c:func:`gearman_job_workload` with the exception that the result must be
 :manpage:`free(3)` by the caller.
 
+gearman_job_use_client returns a :c:type:`gearman_client_st` configured from gearman_job_st. The gearman_client_st can be used to communicate client API commands to the server.
+You do not, and should not, call :c:func:`gearman_client_free` on the gearman_client_st. It is cleaned up when job is cleaned up.
+
 ------------
 RETURN VALUE
 ------------
 
=== modified file 'libgearman-1.0/job.h'
--- libgearman-1.0/job.h	2013-07-10 01:57:34 +0000
+++ libgearman-1.0/job.h	2013-08-31 03:15:41 +0000
@@ -150,6 +150,9 @@
 gearman_worker_st *gearman_job_clone_worker(gearman_job_st *job);
 
 GEARMAN_API
+gearman_client_st *gearman_job_use_client(gearman_job_st *job);
+
+GEARMAN_API
   const char *gearman_job_error(gearman_job_st *job);
 
 /** @} */
 
=== modified file 'libgearman-server/plugins/protocol/gear/protocol.cc'
=== modified file 'libgearman/job.cc'
--- libgearman/job.cc	2013-08-05 22:43:13 +0000
+++ libgearman/job.cc	2013-08-31 03:15:41 +0000
@@ -226,6 +226,7 @@
 
 Job::Job(gearman_job_st* shell_, Worker& worker_):
   _worker(worker_),
+  _client(NULL),
   next(NULL),
   prev(NULL),
   con(NULL),
@@ -247,6 +248,30 @@
   gearman_set_initialized(_shell, true);
 }
 
+Job::~Job()
+{
+  if (_client)
+  {
+    gearman_client_free(_client);
+  }
+
+  delete reducer;
+}
+
+gearman_client_st* Job::client()
+{
+  if (_client == NULL)
+  {
+    _client= gearman_client_create(NULL);
+    if (_client)
+    {
+      gearman_universal_clone(_client->impl()->universal, _worker.universal);
+    }
+  }
+
+  return _client;
+}
+
 bool gearman_job_build_reducer(Job* job, gearman_aggregator_fn *aggregator_fn)
 {
   if (job->reducer)
@@ -272,6 +297,27 @@
   return true;
 }
 
+
+gearman_worker_st *gearman_job_clone_worker(gearman_job_st *job_shell)
+{
+  if (job_shell and job_shell->impl())
+  {
+    return gearman_worker_clone(NULL, job_shell->impl()->_worker.shell());
+  }
+
+  return NULL;
+}
+
+gearman_client_st *gearman_job_use_client(gearman_job_st *job_shell)
+{
+  if (job_shell and job_shell->impl())
+  {
+    return job_shell->impl()->client();
+  }
+
+  return NULL;
+}
+
 static inline void gearman_job_reset_error(Job* job)
 {
   if (job)
@@ -778,9 +824,6 @@
     }
     job->_worker.job_count--;
 
-    delete job->reducer;
-    job->reducer= NULL;
-
     delete job;
   }
   else if (job_shell)
 
=== modified file 'libgearman/job.hpp'
--- libgearman/job.hpp	2013-07-15 19:50:11 +0000
+++ libgearman/job.hpp	2013-08-31 03:15:41 +0000
@@ -43,6 +43,7 @@
 {
 public:
   Job(gearman_job_st* shell_, Worker& worker_);
+  ~Job();
 
   gearman_job_st* shell()
   {
@@ -72,6 +73,7 @@
   }
 
   Worker& _worker;
+  gearman_client_st* _client;
   Job *next;
   Job *prev;
   gearman_connection_st *con;
@@ -85,6 +87,8 @@
     return _worker.universal;
   }
 
+  gearman_client_st* client();
+
   gearman_universal_st& universal() const
   {
     return _worker.universal;
 
=== modified file 'libgearman/worker.cc'
--- libgearman/worker.cc	2013-08-23 07:08:19 +0000
+++ libgearman/worker.cc	2013-08-31 03:15:41 +0000
@@ -1439,16 +1439,6 @@
   return gearman_universal_id(self->impl()->universal);
 }
 
-gearman_worker_st *gearman_job_clone_worker(gearman_job_st *job_shell)
-{
-  if (job_shell and job_shell->impl())
-  {
-    return gearman_worker_clone(NULL, job_shell->impl()->_worker.shell());
-  }
-
-  return NULL;
-}
-
 gearman_return_t gearman_worker_set_identifier(gearman_worker_st *worker,
                                                const char *id, size_t id_size)
 {
 
=== modified file 'm4/ax_uuid.m4'
--- m4/ax_uuid.m4	2013-04-27 04:10:37 +0000
+++ m4/ax_uuid.m4	2013-08-31 03:15:41 +0000
@@ -5,9 +5,9 @@
 #
 # SYNOPSIS
 #
-#   AX_UUID()
-#   AX_UUID_GENERATE_TIME()
-#   AX_UUID_GENERATE_TIME_SAFE()
+#   AX_UUID([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+#   AX_UUID_GENERATE_TIME([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+#   AX_UUID_GENERATE_TIME_SAFE([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
 #
 # DESCRIPTION
 #
@@ -22,7 +22,7 @@
 #   and this notice are preserved. This file is offered as-is, without any
 #   warranty.
 
-#serial 7
+#serial 8
 
 AC_DEFUN([AX_UUID],
     [AC_PREREQ([2.63])dnl
@@ -71,54 +71,66 @@
 
   AC_SUBST([LIBUUID_LIB])
   AM_CONDITIONAL([HAVE_LIBUUID],[test "x$ax_libuuid" = xyes])
+
+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
+  AS_IF([test "x$ax_libuuid" = xyes],
+        [$1],
+        [$2])
   ])
 
   AC_DEFUN([AX_UUID_GENERATE_TIME],
-      [AC_PREREQ([2.63])dnl
-      AC_REQUIRE([AX_UUID])dnl
-      AC_CACHE_CHECK([for uuid_generate_time],
-        [ax_cv_uuid_generate_time],
-        [AX_SAVE_FLAGS
-        LIBS="$LIBUUID_LIB $LIBS"
-        AC_LANG_PUSH([C])
-        AC_RUN_IFELSE([
-          AC_LANG_PROGRAM([#include <uuid/uuid.h>],[
-            uuid_t out;
-            uuid_generate_time(out);
-            ])],
-          [ax_cv_uuid_generate_time=yes],
-          [ax_cv_uuid_generate_time=no],
-          [AC_MSG_WARN([test program execution failed])])
-        AC_LANG_POP
-        AX_RESTORE_FLAGS
-        ])
+           [AC_PREREQ([2.63])dnl
+           AX_UUID([$1],[$2])
+           AC_CACHE_CHECK([for uuid_generate_time],
+                          [ax_cv_uuid_generate_time],
+                          [AX_SAVE_FLAGS
+                          LIBS="$LIBUUID_LIB $LIBS"
+                          AC_LANG_PUSH([C])
+                          AC_RUN_IFELSE([
+                                        AC_LANG_PROGRAM([#include <uuid/uuid.h>],[
+                                                        uuid_t out;
+                                                        uuid_generate_time(out);
+                                                        ])],
+                                        [ax_cv_uuid_generate_time=yes],
+                                        [ax_cv_uuid_generate_time=no],
+                                        [AC_MSG_WARN([test program execution failed])])
+                          AC_LANG_POP
+                          AX_RESTORE_FLAGS
+                          ])
 
-      AS_IF([test "$ax_cv_uuid_generate_time" = yes],
-        [AC_DEFINE([HAVE_UUID_GENERATE_TIME],[1],[Define if uuid_generate_time is present in uuid/uuid.h.])],
-        [AC_DEFINE([HAVE_UUID_GENERATE_TIME],[0],[Define if uuid_generate_time is present in uuid/uuid.h.])])
-      ])
+           AS_IF([test "$ax_cv_uuid_generate_time" = yes],
+                 [AC_DEFINE([HAVE_UUID_GENERATE_TIME],[1],[Define if uuid_generate_time is present in uuid/uuid.h.])],
+                 [AC_DEFINE([HAVE_UUID_GENERATE_TIME],[0],[Define if uuid_generate_time is present in uuid/uuid.h.])])
+  AS_IF([test "x$ax_cv_uuid_generate_time" = xyes],
+        [$1],
+        [$2])
+  ])
 
   AC_DEFUN([AX_UUID_GENERATE_TIME_SAFE],
-      [AC_PREREQ([2.63])dnl
-      AC_REQUIRE([AX_UUID])dnl
-      AC_CACHE_CHECK([for uuid_generate_time_safe],
-        [ax_cv_uuid_generate_time_safe],
-        [AX_SAVE_FLAGS
-        LIBS="$LIBUUID_LIB $LIBS"
-        AC_LANG_PUSH([C])
-        AC_RUN_IFELSE([
-          AC_LANG_PROGRAM([#include <uuid/uuid.h>],[
-            uuid_t out;
-            uuid_generate_time_safe(out);
-            ])],
-          [ax_cv_uuid_generate_time_safe=yes],
-          [ax_cv_uuid_generate_time_safe=no],
-          [AC_MSG_WARN([test program execution failed])])
-        AC_LANG_POP
-        AX_RESTORE_FLAGS
-        ])
-
-      AS_IF([test "$ax_cv_uuid_generate_time_safe" = yes],
-        [AC_DEFINE([HAVE_UUID_GENERATE_TIME_SAFE],[1],[Define if uuid_generate_time_safe is present in uuid/uuid.h.])],
-        [AC_DEFINE([HAVE_UUID_GENERATE_TIME_SAFE],[0],[Define if uuid_generate_time_safe is present in uuid/uuid.h.])])
-      ])
+           [AC_PREREQ([2.63])dnl
+           AX_UUID([$1],[$2])
+           AC_CACHE_CHECK([for uuid_generate_time_safe],
+                          [ax_cv_uuid_generate_time_safe],
+                          [AX_SAVE_FLAGS
+                          LIBS="$LIBUUID_LIB $LIBS"
+                          AC_LANG_PUSH([C])
+                          AC_RUN_IFELSE([
+                                        AC_LANG_PROGRAM([#include <uuid/uuid.h>],[
+                                                        uuid_t out;
+                                                        uuid_generate_time_safe(out);
+                                                        ])],
+                                        [ax_cv_uuid_generate_time_safe=yes],
+                                        [ax_cv_uuid_generate_time_safe=no],
+                                        [AC_MSG_WARN([test program execution failed])])
+                          AC_LANG_POP
+                          AX_RESTORE_FLAGS
+                          ])
+
+           AS_IF([test "$ax_cv_uuid_generate_time_safe" = yes],
+                 [AC_DEFINE([HAVE_UUID_GENERATE_TIME_SAFE],[1],[Define if uuid_generate_time_safe is present in uuid/uuid.h.])],
+                 [AC_DEFINE([HAVE_UUID_GENERATE_TIME_SAFE],[0],[Define if uuid_generate_time_safe is present in uuid/uuid.h.])])
+
+  AS_IF([test "x$ax_cv_uuid_generate_time_safe" = xyes],
+        [$1],
+        [$2])
+  ])
 
=== modified file 'man/include.am'
--- man/include.am	2013-08-16 08:58:49 +0000
+++ man/include.am	2013-08-31 03:15:41 +0000
@@ -87,6 +87,7 @@
 notrans_dist_man_MANS+= gearman_job_st.3
 notrans_dist_man_MANS+= gearman_job_take_workload.3
 notrans_dist_man_MANS+= gearman_job_unique.3
+notrans_dist_man_MANS+= gearman_job_use_client.3
 notrans_dist_man_MANS+= gearman_job_workload.3
 notrans_dist_man_MANS+= gearman_job_workload_size.3
 notrans_dist_man_MANS+= gearman_log_fn.3
 
=== modified file 'support/gearmand.spec.in'
--- support/gearmand.spec.in	2013-07-18 05:59:53 +0000
+++ support/gearmand.spec.in	2013-08-31 03:15:41 +0000
@@ -235,6 +235,7 @@
 %{_mandir}/man3/gearman_job_st.3.gz
 %{_mandir}/man3/gearman_job_take_workload.3.gz
 %{_mandir}/man3/gearman_job_unique.3.gz
+%{_mandir}/man3/gearman_job_use_client.3.gz
 %{_mandir}/man3/gearman_job_workload.3.gz
 %{_mandir}/man3/gearman_job_workload_size.3.gz
 %{_mandir}/man3/gearman_log_fn.3.gz
 
=== modified file 'tests/libgearman-1.0/worker_test.cc'
--- tests/libgearman-1.0/worker_test.cc	2013-08-20 09:27:42 +0000
+++ tests/libgearman-1.0/worker_test.cc	2013-08-31 03:15:41 +0000
@@ -62,6 +62,7 @@
 
 #include "tests/start_worker.h"
 #include "tests/workers/v2/call_exception.h"
+#include "tests/workers/v2/client_echo.h"
 #include "tests/workers/v2/echo_or_react.h"
 #include "tests/workers/v2/echo_or_react_chunk.h"
 #include "tests/workers/v2/call_exception.h"
@@ -942,6 +943,75 @@
   return TEST_SUCCESS;
 }
 
+static test_return_t gearman_job_client_TEST(void *)
+{
+  gearman_function_t call_client_echo_WORKER_FN= gearman_function_create(client_echo_WORKER);
+  std::auto_ptr<worker_handle_st> handle(test_worker_start(libtest::default_port(),
+                                                           NULL,
+                                                           "client_echo",
+                                                           call_client_echo_WORKER_FN,
+                                                           NULL,
+                                                           gearman_worker_options_t(),
+                                                           0)); // timeout
+
+  std::vector<gearman_task_st*> tasks;
+  libgearman::Client client(libtest::default_port());
+
+  gearman_client_add_options(&client, GEARMAN_CLIENT_EXCEPTION);
+
+  for (size_t x= 0; x < 10; ++x)
+  {
+    char buffer[GEARMAN_MAXIMUM_INTEGER_DISPLAY_LENGTH];
+    int buffer_length= snprintf(buffer, sizeof(buffer), "%d", int(x));
+    gearman_return_t ret;
+    gearman_task_st *task= gearman_client_add_task(&client,
+                                                   NULL, // preallocated task
+                                                   NULL, // context 
+                                                   "client_echo", // function
+                                                   NULL, // unique
+                                                   (const void*)buffer, size_t(buffer_length), // workload
+                                                   &ret);
+    ASSERT_EQ(ret, GEARMAN_SUCCESS);
+    ASSERT_TRUE(task);
+
+    tasks.push_back(task);
+  }
+
+  bool more= true;
+  while (more)
+  {
+    for (std::vector<gearman_task_st*>::iterator iter= tasks.begin();
+         iter != tasks.end(); ++iter)
+    {
+      if (gearman_task_return(*iter) == GEARMAN_UNKNOWN_STATE)
+      {
+        {
+          gearman_return_t ret;
+          do {
+            ret= gearman_client_run_tasks(&client);
+          } while (gearman_continue(ret));
+
+          if (gearman_failed(ret))
+          {
+            Error << gearman_strerror(ret);
+          }
+          ASSERT_EQ(GEARMAN_SUCCESS, ret);
+        }
+
+        continue;
+      }
+      else
+      {
+        ASSERT_EQ(GEARMAN_SUCCESS, gearman_task_return(*iter));
+      }
+
+      more= false;
+    }
+  }
+
+  return TEST_SUCCESS;
+}
+
 static test_return_t gearman_job_send_exception_TEST(void *)
 {
   libgearman::Client client(libtest::default_port());
@@ -1671,6 +1741,7 @@
   {"gearman_client_job_status(is_known)", 0, gearman_client_job_status_is_known_TEST },
   {"gearman_job_send_exception()", 0, gearman_job_send_exception_TEST },
   {"gearman_job_send_exception(mass)", 0, gearman_job_send_exception_mass_TEST },
+  {"gearman_job_client()", 0, gearman_job_client_TEST },
   {"job order", 0, job_order_TEST },
   {"job background order", 0, job_order_background_TEST },
   {"echo_max", 0, echo_max_test },
 
=== modified file 'tests/workers/include.am'
--- tests/workers/include.am	2013-05-28 22:55:50 +0000
+++ tests/workers/include.am	2013-08-31 03:15:41 +0000
@@ -16,6 +16,7 @@
 noinst_HEADERS+= tests/workers/v2/call_exception.h
 noinst_HEADERS+= tests/workers/v2/called.h
 noinst_HEADERS+= tests/workers/v2/check_order.h
+noinst_HEADERS+= tests/workers/v2/client_echo.h
 noinst_HEADERS+= tests/workers/v2/count.h
 noinst_HEADERS+= tests/workers/v2/echo_or_react.h
 noinst_HEADERS+= tests/workers/v2/echo_or_react_chunk.h
@@ -46,6 +47,7 @@
 tests_libstartworker_la_SOURCES+= tests/workers/v1/unique.cc
 tests_libstartworker_la_SOURCES+= tests/workers/v2/call_exception.cc
 tests_libstartworker_la_SOURCES+= tests/workers/v2/called.cc
+tests_libstartworker_la_SOURCES+= tests/workers/v2/client_echo.cc
 tests_libstartworker_la_SOURCES+= tests/workers/v2/count.cc
 tests_libstartworker_la_SOURCES+= tests/workers/v2/echo_or_react.cc
 tests_libstartworker_la_SOURCES+= tests/workers/v2/echo_or_react_chunk.cc
 
=== added file 'tests/workers/v2/client_echo.cc'
--- tests/workers/v2/client_echo.cc	1970-01-01 00:00:00 +0000
+++ tests/workers/v2/client_echo.cc	2013-08-31 03:15:41 +0000
@@ -0,0 +1,67 @@
+/*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ * 
+ *  Gearmand client and server library.
+ *
+ *  Copyright (C) 2013 Data Differential, http://datadifferential.com/
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *      * Redistributions of source code must retain the above copyright
+ *  notice, this list of conditions and the following disclaimer.
+ *
+ *      * Redistributions in binary form must reproduce the above
+ *  copyright notice, this list of conditions and the following disclaimer
+ *  in the documentation and/or other materials provided with the
+ *  distribution.
+ *
+ *      * The names of its contributors may not be used to endorse or
+ *  promote products derived from this software without specific prior
+ *  written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include <gear_config.h>
+
+#include <libtest/test.hpp>
+
+#include <libgearman-1.0/gearman.h>
+
+#include "tests/workers/v2/client_echo.h"
+
+#include <cassert>
+#include <cstring>
+
+gearman_return_t client_echo_WORKER(gearman_job_st *job, void *)
+{
+  gearman_client_st* client= gearman_job_use_client(job);
+
+  if (client)
+  {
+    if (gearman_failed(gearman_client_echo(client, test_literal_param("Tastes great"))))
+    {
+      assert(gearman_client_error(client));
+      return gearman_job_send_exception(job, gearman_client_error(client), strlen(gearman_client_error(client)));
+    }
+  }
+  else
+  {
+    return gearman_job_send_exception(job, test_literal_param("Failed to allocate gearman_client_st"));
+  }
+
+  return GEARMAN_SUCCESS;
+}
 
=== added file 'tests/workers/v2/client_echo.h'
--- tests/workers/v2/client_echo.h	1970-01-01 00:00:00 +0000
+++ tests/workers/v2/client_echo.h	2013-08-31 03:15:41 +0000
@@ -0,0 +1,42 @@
+/*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ * 
+ *  Gearmand client and server library.
+ *
+ *  Copyright (C) 2013 Data Differential, http://datadifferential.com/
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *      * Redistributions of source code must retain the above copyright
+ *  notice, this list of conditions and the following disclaimer.
+ *
+ *      * Redistributions in binary form must reproduce the above
+ *  copyright notice, this list of conditions and the following disclaimer
+ *  in the documentation and/or other materials provided with the
+ *  distribution.
+ *
+ *      * The names of its contributors may not be used to endorse or
+ *  promote products derived from this software without specific prior
+ *  written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#pragma once
+
+LIBTEST_API
+gearman_return_t client_echo_WORKER(gearman_job_st *job, void *);
+