Merge Eric

ChangeLog

@@ -1,15 +1,14 @@
-<<<<<<< TREE
-0.6
- * Fixed rpm building (make rpm)
-=======
-0.6 - 2009-05-14
+0.6.0 - 2009-05-18
+ * Added persistent queue support with a libdrizzle module. This allows queue
+   storage for both Drizzle and MySQL.
+ * Added Solaris service scripts (Trond Norbye).
+ * Fixed rpm building (make rpm).
  * Removed AI_V4MAPPED for client/worker connect lookup, not fully
    supported in all operating systems (like FreeBSD, bug #373060).
  * Support for gearmand to bind to multiple addresses.
  * Protocol document updates and fixes (Eric Day, Eric Herman)
  * Bind to specific hostname in gearmand (Brian Moon).
  * Minor cleanup and fixes.
->>>>>>> MERGE-SOURCE
 
 0.5 - 2009-04-22
  * Threaded Gearman job server (gearmand).

Makefile.am

@@ -11,6 +11,9 @@ SUBDIRS = libgearman gearmand bin tests examples scripts support benchmark
 
 include $(top_srcdir)/docs/man_list
 
+EXTRA_DIST= docs/Doxyfile.api docs/Doxyfile.dev \
+	docs/api_header.html docs/dev_header.html docs/doxygen.h
+
 docs: all
 	${DOXYGEN} docs/Doxyfile.api
 	${DOXYGEN} docs/Doxyfile.dev

bin/Makefile.am

@@ -5,7 +5,7 @@
 # Use and distribution licensed under the BSD license.  See
 # the COPYING file in the parent directory for full text.
 
-AM_LDFLAGS= $(LTLIBUUID) $(LTLIBEVENT) $(top_builddir)/libgearman/libgearman.la
+AM_LDFLAGS= $(top_builddir)/libgearman/libgearman.la
 
 bin_PROGRAMS= \
 	gearman

configure.ac

@@ -15,14 +15,12 @@ GEARMAN_MAJOR_VERSION=0
 GEARMAN_MINOR_VERSION=6
 GEARMAN_MICRO_VERSION=0
 GEARMAN_VERSION=$GEARMAN_MAJOR_VERSION.$GEARMAN_MINOR_VERSION.$GEARMAN_MICRO_VERSION
-GEARMAN_RELEASE=$GEARMAN_MAJOR_VERSION.$GEARMAN_MINOR_VERSION
 GEARMAN_LIBRARY_VERSION=$GEARMAN_MAJOR_VERSION:$GEARMAN_MINOR_VERSION:$GEARMAN_MICRO_VERSION
 
 PACKAGE=gearmand
-VERSION=$GEARMAN_RELEASE
+VERSION=$GEARMAN_VERSION
 
 AC_SUBST(GEARMAN_VERSION)
-AC_SUBST(GEARMAN_RELEASE)
 AC_SUBST(GEARMAN_LIBRARY_VERSION)
 
 # Setting CFLAGS here prevents AC_CANONICAL_TARGET from injecting them
@@ -190,7 +188,24 @@ then
   AC_CHECK_LIB(mtmalloc,malloc,[],[])
 fi
 
+#--------------------------------------------------------------------
+# Check for libuuid
+#--------------------------------------------------------------------
+
+AC_CHECK_HEADERS(libdrizzle/drizzle_client.h)
+if test "x$ac_cv_header_libdrizzle_drizzle_client_h" = "xyes"
+then
+  AC_LIB_HAVE_LINKFLAGS(drizzle,,
+  [
+  #include <libdrizzle/drizzle_client.h>
+  ],
+  [
+    drizzle_st drizzle;
+    drizzle_version();
+  ])
+fi
 
+AM_CONDITIONAL(HAVE_LIBDRIZZLE, test x$ac_cv_libdrizzle = xyes)
 
 dnl TODO: Remove this define once we are using 2.61 across the board.
 # AX_HEADER_ASSERT

docs/Doxyfile.api

@@ -534,7 +534,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = docs libgearman examples/reverse_client.c examples/reverse_client_bg.c examples/reverse_client_cb.c examples/reverse_worker.c examples/reverse_worker_bg.c
+INPUT                  = docs libgearman examples/reverse_client.c examples/reverse_client_bg.c examples/reverse_client_cb.c examples/reverse_worker.c
 
 # This tag can be used to specify the character encoding of the source files 
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 

docs/Doxyfile.dev

@@ -534,7 +534,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = docs libgearman examples/reverse_client.c examples/reverse_client_bg.c examples/reverse_client_cb.c examples/reverse_worker.c examples/reverse_worker_bg.c
+INPUT                  = docs libgearman examples/reverse_client.c examples/reverse_client_bg.c examples/reverse_client_cb.c examples/reverse_worker.c
 
 # This tag can be used to specify the character encoding of the source files 
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 

docs/doxygen.h

@@ -81,12 +81,12 @@ in "ret" and shoulf always be checked.
 
 If you need to run multiple tasks at the same time, you'll want to
 use the concurrent interface. After the client setup, you will then
-add tasks to be run. This jsut queues the task and does not actually
+add tasks to be run. This just queues the task and does not actually
 run it. You then call gearman_run_tasks() to submit and process the
 jobs in parallel. When using the concurrent interface, you need to
 specify callback functions for each action you may care about. For
-example, if you want to know when a task completes, you would pass
-in a gearman_complete_fn callback function to be run for each task.
+example, if you want to know when a task completes, you would set a
+gearman_complete_fn callback function to be run for each task.
 
 @code
 
@@ -103,12 +103,13 @@ static gearman_return_t fail(gearman_task_st *task)
   return GEARMAN_SUCCESS;
 }
 
-gearman_client_set_options(&client, GEARMAN_CLIENT_BUFFER_RESULT, 1);
 gearman_client_add_task(&client, &task1, NULL, "function", "argument1",
                         strlen("argument1"), &ret);
 gearman_client_add_task(&client, &task2, NULL, "function", "argument2",
                         strlen("argument2"), &ret);
-gearman_client_run_tasks(&client, NULL, NULL, NULL, NULL, complete, fail);
+gearman_client_set_complete_fn(&client, complete);
+gearman_client_set_fail_fn(&client, fail);
+gearman_client_run_tasks(&client);
 
 @endcode
 
@@ -171,9 +172,9 @@ The last component of the worker is the callback function. This will look like:
 void *function_callback(gearman_job_st *job, void *cb_arg, size_t *result_size,
                         gearman_return_t *ret_ptr)
 {
-  char *resilt;
+  char *result;
 
-  result== strdup((char *)gearman_job_workload(job));
+  result= strdup((char *)gearman_job_workload(job));
   *result_size= gearman_job_workload_size(job);
 
   *ret_ptr= GEARMAN_SUCCESS;

docs/man/man1/gearman.1

@@ -1,4 +1,4 @@
-.TH gearman 1 2009-04-18 "Gearman" "Gearman Job Queue System"
+.TH gearman 1 2009-04-18 "Gearman" "Gearman"
 .SH NAME
 gearman \- command line interface for Gearman clients and workers
 .SH SYNOPSIS

docs/man_gen.perl

@@ -15,7 +15,7 @@ use POSIX qw(strftime);
 my $path= "docs/man";
 my $section= 3;
 my $short= "Gearman";
-my $long= "Gearman Job Queue System";
+my $long= "Gearman";
 my $include= "#include <libgearman/gearman.h>";
 my $website= "The Gearman homepage: http://www.gearman.org/";
 my $bugs= "Bugs should be reported at https://bugs.launchpad.net/gearmand";
@@ -31,11 +31,19 @@ my $line;
 my $proc= 0;
 my $code= 0;
 my $data;
+my $group;
 
 print "\ndist_man_MANS= docs/man/man1/gearman.1";
 
 while ($line= <>)
 {
+  if ($line=~ s/.*\@addtogroup *[a-z_]* *//)
+  {
+    chomp($line);
+    $group= $line;
+    next;
+  }
+
   if ($line=~ m/^\/\*\*/)
   {
     # We have a start of a comment block.
@@ -78,6 +86,8 @@ while ($line= <>)
         $func=~ s/ ([a-z_\*]*),/ \" $1 \",/g;
         open(MANSRC, ">$path/man$section/$name.$section");
         print MANSRC ".TH $name $section $date \"$short\" \"$long\"\n";
+        print MANSRC ".SH NAME\n";
+        print MANSRC "$name \\- $group\n";
         print MANSRC ".SH SYNOPSIS\n";
         print MANSRC ".B $include\n";
         print MANSRC ".sp\n";

gearmand/Makefile.am

@@ -7,8 +7,7 @@
 
 sbin_PROGRAMS= gearmand
 
-gearmand_LDADD= $(LTLIBUUID) $(LTLIBEVENT) \
-	$(top_builddir)/libgearman/libgearman.la
+gearmand_LDADD= $(top_builddir)/libgearman/libgearman.la
 
 gearmand_SOURCES= gearmand.c