Merge in updates since .20, this includes new build configs.

.bzrignore

@@ -21,6 +21,7 @@ benchmark/blobslap_client
 benchmark/blobslap_worker
 bin/gearadmin
 bin/gearman
+bin/wait
 config.h
 config.h.in
 config.log
@@ -34,18 +35,24 @@ config/ltmain.sh
 config/missing
 config/pandora_vc_revinfo
 config/plugin.ac
+config/top.h
 configure
-configure.h
+docs/_static
+docs/doctrees
+docs/html
 examples/echo_client
 examples/echo_worker
 examples/reverse_client
 examples/reverse_client_bg
 examples/reverse_client_cb
+examples/reverse_client_epoch
 examples/reverse_worker
 examples/wc_worker
 gearmand/gearmand
 gearmand/gearmand_hostile
 gearmand/gearmand_test
+libgearman/version.h
+libhostile
 libtest/wait
 libtool
 m4/libtool.m4
@@ -89,10 +96,3 @@ tests/var/tmp/*
 tests/worker_test
 tests/worker_test.res
 unittests/unittests
-config/top.h
-bin/wait
-libhostile
-examples/reverse_client_epoch
-docs/doctrees
-docs/_static
-docs/html

.quickly

@@ -0,0 +1,5 @@
+project = gearmand
+version = 0.4.2
+template = pandora-build
+project-type = application
+pandora-version = 0.176

ChangeLog

@@ -1,4 +1,6 @@
-  * Support for "drop function"
+  * Support for "drop function" 
+
+  * Forces do operations to complete no matter how the worker is designed.
 
 0.20 Fri Apr  8 09:25:15 PDT 2011
   * gearman_client_execute() interface added

Makefile.am

@@ -25,13 +25,6 @@ GEARMAN_TMP = ${abs_top_builddir}/tests/var/tmp/
 
 CLEANFILES+= config/top.h
 
-CLIENT_LD_FLAGS=
-if TARGET_OSX
-CLIENT_LD_FLAGS+= $(BOOST_PROGRAM_OPTIONS_LDFLAGS)
-else
-CLIENT_LD_FLAGS+= -L$(BOOST_PROGRAM_OPTIONS_LDPATH)
-endif
-
 
 include benchmark/include.am
 include bin/include.am

bin/client.h

@@ -40,7 +40,8 @@
 class Client
 {
 public:
-  Client()
+  Client() :
+    _client()
   {
     if (gearman_client_create(&_client) == NULL)
     {

bin/function.cc

@@ -14,10 +14,11 @@
 
 namespace gearman_client
 {
-Function::Function(const char *name_arg)
+Function::Function(const char *name_arg) :
+  _name(),
+  _task(),
+  _buffer()
 {
-  memset(&_task, 0, sizeof(gearman_task_st));
-
   // copy the name into the _name vector
   size_t length= strlen(name_arg);
   _name.resize(length +1);

bin/include.am

@@ -20,18 +20,15 @@ bin_PROGRAMS+= \
 bin_gearadmin_SOURCES= \
 		       bin/gearadmin.cc \
 		       util/instance.cc
-
 bin_gearadmin_CPPFLAGS= \
 			$(AM_CPPFLAGS) \
 			$(BOOST_CPPFLAGS)
-
 bin_gearadmin_LDFLAGS= \
-		       $(CLIENT_LD_FLAGS) \
-		       $(AM_LDFLAGS)
-
+		       $(AM_LDFLAGS) \
+		       $(BOOST_PROGRAM_OPTIONS_LDFLAGS)
 bin_gearadmin_LDADD= \
-		     $(AM_LDADD) \
-		     $(BOOST_PROGRAM_OPTIONS_LIBS)
+		     $(BOOST_PROGRAM_OPTIONS_LIBS) \
+		     ${BETTER_MALLOC_LIBS}
 
 bin_gearman_SOURCES= \
 		     bin/arguments.cc \
@@ -39,8 +36,8 @@ bin_gearman_SOURCES= \
 		     bin/gearman.cc \
 		     util/error.cc \
 		     util/pidfile.cc
-
-bin_gearman_LDADD= libgearman/libgearman.la ${BETTER_MALLOC_LIBS}
+bin_gearman_LDADD= \
+		   libgearman/libgearman.la
 
 noinst_HEADERS+= \
 		 bin/arguments.h \

bin/worker.h

@@ -40,7 +40,8 @@
 class Worker
 {
 public:
-  Worker()
+  Worker() :
+    _worker()
   {
     if (gearman_worker_create(&_worker) == NULL)
     {

config/autorun.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 #
-#  Copyright (c) 2006 Jan Kneschke
-#  Copyright (c) 2009 Sun Microsystems
+#  Copyright (C) 2006 Jan Kneschke
+#  Copyright (C) 2009 Sun Microsystems, Inc.
 #  All rights reserved.
 # 
 #  Redistribution and use in source and binary forms, with or without
@@ -35,7 +35,7 @@ die() { echo "$@"; exit 1; }
 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

config/lcov.am

@@ -0,0 +1,42 @@
+#  Copyright (C) 2010 Hartmut Holzgraefe
+#
+#  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
+
+LCOV = lcov
+LCOV_GENHTML = genhtml
+
+lcov: lcov-html
+
+lcov-test: lcov-clean-data test
+
+drizzle_lcov.info: lcov-test
+	@echo "Generating $@"
+	$(LCOV) --directory . --capture --base-directory . --output-file $@
+	$(LCOV) --remove $@ '/usr/include/*' --output-file $@
+	$(LCOV) --remove $@ '/usr/local/include/*' --output-file $@
+	@echo
+
+lcov-html: drizzle_lcov.info
+	@echo "Generating lcov HTML"
+	@$(LCOV_GENHTML) --legend --output-directory lcov_html/ --title "Drizzle Code Coverage" $<
+
+lcov-clean:
+	rm -f drizzle_lcov.info
+	rm -rf lcov_data/
+	rm -rf lcov_html/
+
+lcov-clean-data:
+	@find . -name \*.gcda -o -name \*.da -o -name \*.bbg? | xargs rm -f
+
+