Browse Source

Merge in fix for naming.

Brian Aker 13 years ago
parent
commit
4745b1d452

+ 4 - 7
docs/conf.py.in

@@ -336,13 +336,10 @@ man_pages = [
   ('libgearman/gearman_verbose_t', 'gearman_verbose_name', u'Gearmand Documentation, http://gearman.info/', [u'Data Differential http://datadifferential.com/'], 3),
   ('libgearman/gearman_verbose_t', 'gearman_verbose_t', u'Gearmand Documentation, http://gearman.info/', [u'Data Differential http://datadifferential.com/'], 3),
   ('libgearman/gearman_version', 'gearman_version', u'Gearmand Documentation, http://gearman.info/', [u'Data Differential http://datadifferential.com/'], 3),
-  ('libgearman/gearman_work_t', 'gearman_work_t', u'Gearmand Documentation, http://gearman.info/', [u'Data Differential http://datadifferential.com/'], 3),
-  ('libgearman/gearman_work_t', 'gearman_work', u'Gearmand Documentation, http://gearman.info/', [u'Data Differential http://datadifferential.com/'], 3),
-  ('libgearman/gearman_work_t', 'gearman_work_epoch', u'Gearmand Documentation, http://gearman.info/', [u'Data Differential http://datadifferential.com/'], 3),
-  ('libgearman/gearman_work_t', 'gearman_work_background', u'Gearmand Documentation, http://gearman.info/', [u'Data Differential http://datadifferential.com/'], 3),
-  ('libgearman/gearman_work_t', 'gearman_work_map', u'Gearmand Documentation, http://gearman.info/', [u'Data Differential http://datadifferential.com/'], 3),
-  ('libgearman/gearman_work_t', 'gearman_work_epoch_with_map', u'Gearmand Documentation, http://gearman.info/', [u'Data Differential http://datadifferential.com/'], 3),
-  ('libgearman/gearman_work_t', 'gearman_work_background_with_map', u'Gearmand Documentation, http://gearman.info/', [u'Data Differential http://datadifferential.com/'], 3),
+  ('libgearman/gearman_task_attr_t', 'gearman_task_attr_t', u'Gearmand Documentation, http://gearman.info/', [u'Data Differential http://datadifferential.com/'], 3),
+  ('libgearman/gearman_task_attr_t', 'gearman_task_attr_init', u'Gearmand Documentation, http://gearman.info/', [u'Data Differential http://datadifferential.com/'], 3),
+  ('libgearman/gearman_task_attr_t', 'gearman_task_attr_init_epoch', u'Gearmand Documentation, http://gearman.info/', [u'Data Differential http://datadifferential.com/'], 3),
+  ('libgearman/gearman_task_attr_t', 'gearman_task_attr_init_background', u'Gearmand Documentation, http://gearman.info/', [u'Data Differential http://datadifferential.com/'], 3),
   ('libgearman/gearman_worker_add_server', 'gearman_worker_add_server', u'Gearmand Documentation, http://gearman.info/', [u'Data Differential http://datadifferential.com/'], 3),
   ('libgearman/gearman_worker_add_server', 'gearman_worker_add_servers', u'Gearmand Documentation, http://gearman.info/', [u'Data Differential http://datadifferential.com/'], 3),
   ('libgearman/gearman_worker_add_server', 'gearman_worker_remove_servers', u'Gearmand Documentation, http://gearman.info/', [u'Data Differential http://datadifferential.com/'], 3),

+ 7 - 10
docs/include.am

@@ -165,13 +165,10 @@ man3_MANS+= \
 	    docs/man/gearman_worker_unregister_all.3 \
 	    docs/man/gearman_worker_wait.3 \
 	    docs/man/gearman_worker_work.3 \
-	    docs/man/gearman_work.3 \
-	    docs/man/gearman_work_background.3 \
-	    docs/man/gearman_work_background_with_map.3 \
-	    docs/man/gearman_work_epoch.3 \
-	    docs/man/gearman_work_epoch_with_map.3 \
-	    docs/man/gearman_work_map.3 \
-	    docs/man/gearman_work_t.3 \
+	    docs/man/gearman_task_attr_init.3 \
+	    docs/man/gearman_task_attr_init_background.3 \
+	    docs/man/gearman_task_attr_init_epoch.3 \
+	    docs/man/gearman_task_attr_t.3 \
 	    docs/man/gearman_client_options_t.3 \
 	    docs/man/gearman_client_has_option.3 \
 	    docs/man/libgearman.3
@@ -295,13 +292,13 @@ noinst_PROGRAMS+= \
 		  docs/libgearman/examples/gearman_client_do_background_example \
 		  docs/libgearman/examples/gearman_client_do_example \
 		  docs/libgearman/examples/gearman_execute_example \
-		  docs/libgearman/examples/gearman_execute_map_reduce
+		  docs/libgearman/examples/gearman_execute_partition
 
 docs_libgearman_examples_gearman_execute_example_SOURCES= docs/libgearman/examples/gearman_execute_example.c
 docs_libgearman_examples_gearman_execute_example_LDADD= libgearman/libgearman.la
 
-docs_libgearman_examples_gearman_execute_map_reduce_SOURCES= docs/libgearman/examples/gearman_execute_map_reduce.c
-docs_libgearman_examples_gearman_execute_map_reduce_LDADD= libgearman/libgearman.la
+docs_libgearman_examples_gearman_execute_partition_SOURCES= docs/libgearman/examples/gearman_execute_partition.c
+docs_libgearman_examples_gearman_execute_partition_LDADD= libgearman/libgearman.la
 
 docs_libgearman_examples_gearman_client_do_example_SOURCES= docs/libgearman/examples/gearman_client_do_example.c
 docs_libgearman_examples_gearman_client_do_example_LDADD= libgearman/libgearman.la

+ 1 - 1
docs/index.rst

@@ -125,7 +125,7 @@ Structures
    libgearman/gearman_argument_t 
    libgearman/gearman_string_t 
    libgearman/gearman_result_t 
-   libgearman/gearman_work_t
+   libgearman/gearman_task_attr_t
 
 
 *****

+ 1 - 1
docs/libgearman/examples.rst

@@ -19,7 +19,7 @@ gearman_execute() with reducer function
 In this example we call the function count and tell it to map values using
 word_split.
 
-.. literalinclude:: examples/gearman_execute_map_reduce.c
+.. literalinclude:: examples/gearman_execute_partition.c
   :language: c
 
 

+ 1 - 1
docs/libgearman/examples/gearman_execute_example.c

@@ -23,7 +23,7 @@ int main(void)
                                          "reverse", strlen("reverse"),  // function
                                          NULL, 0,  // no unique value provided
                                          NULL, 
-                                         &value);
+                                         &value, 0);
 
   if (task == NULL) // If gearman_execute() can return NULL on error
   {

+ 225 - 0
docs/libgearman/examples/gearman_execute_partition

@@ -0,0 +1,225 @@
+#! /bin/sh
+
+# docs/libgearman/examples/gearman_execute_partition - temporary wrapper script for .libs/gearman_execute_partition
+# Generated by libtool (GNU libtool) 2.2.10
+#
+# The docs/libgearman/examples/gearman_execute_partition program cannot be directly executed until all the libtool
+# libraries that it depends on are installed.
+#
+# This wrapper script should never be moved out of the build directory.
+# If it is, it will not operate correctly.
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
+
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+relink_command="(cd /home/brian/gearmand-trunk; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; { test -z \"\${LD_LIBRARY_PATH+set}\" || unset LD_LIBRARY_PATH || { LD_LIBRARY_PATH=; export LD_LIBRARY_PATH; }; }; PATH=/usr/lib64/qt-3.3/bin:/usr/lib64/ccache:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/home/brian/bin; export PATH; gcc -std=gnu99 -pthread -pipe -O2 -fvisibility=hidden -Werror -pedantic -Wall -Wundef -Wshadow -fdiagnostics-show-option -floop-parallelize-all -Wstrict-aliasing -Wswitch-enum -Wextra -Wformat -Wno-format-nonliteral -Wno-format-security -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wmissing-declarations -Wcast-align -Wswitch-default -Wswitch-enum -Wwrite-strings -Wlogical-op -o \$progdir/\$file docs/libgearman/examples/gearman_execute_partition.o  -L/usr/local/lib libgearman/.libs/libgearman.so -luuid -lrt -pthread -Wl,-rpath -Wl,/home/brian/gearmand-trunk/libgearman/.libs)"
+
+# This environment variable determines our operation mode.
+if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then
+  # install mode needs the following variables:
+  generated_by_libtool_version='2.2.10'
+  notinst_deplibs=' libgearman/libgearman.la'
+else
+  # When we are sourced in execute mode, $file and $ECHO are already set.
+  if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
+    file="$0"
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
+    ECHO="printf %s\\n"
+  fi
+
+# Very basic option parsing. These options are (a) specific to
+# the libtool wrapper, (b) are identical between the wrapper
+# /script/ and the wrapper /executable/ which is used only on
+# windows platforms, and (c) all begin with the string --lt-
+# (application programs are unlikely to have options which match
+# this pattern).
+#
+# There are only two supported options: --lt-debug and
+# --lt-dump-script. There is, deliberately, no --lt-help.
+#
+# The first argument to this parsing function should be the
+# script's ./libtool value, followed by no.
+lt_option_debug=
+func_parse_lt_options ()
+{
+  lt_script_arg0=$0
+  shift
+  for lt_opt
+  do
+    case "$lt_opt" in
+    --lt-debug) lt_option_debug=1 ;;
+    --lt-dump-script)
+        lt_dump_D=`$ECHO "X$lt_script_arg0" | /bin/sed -e 's/^X//' -e 's%/[^/]*$%%'`
+        test "X$lt_dump_D" = "X$lt_script_arg0" && lt_dump_D=.
+        lt_dump_F=`$ECHO "X$lt_script_arg0" | /bin/sed -e 's/^X//' -e 's%^.*/%%'`
+        cat "$lt_dump_D/$lt_dump_F"
+        exit 0
+      ;;
+    --lt-*)
+        $ECHO "Unrecognized --lt- option: '$lt_opt'" 1>&2
+        exit 1
+      ;;
+    esac
+  done
+
+  # Print the debug banner immediately:
+  if test -n "$lt_option_debug"; then
+    echo "gearman_execute_partition:docs/libgearman/examples/gearman_execute_partition:${LINENO}: libtool wrapper (GNU libtool) 2.2.10" 1>&2
+  fi
+}
+
+# Used when --lt-debug. Prints its arguments to stdout
+# (redirection is the responsibility of the caller)
+func_lt_dump_args ()
+{
+  lt_dump_args_N=1;
+  for lt_arg
+  do
+    $ECHO "gearman_execute_partition:docs/libgearman/examples/gearman_execute_partition:${LINENO}: newargv[$lt_dump_args_N]: $lt_arg"
+    lt_dump_args_N=`expr $lt_dump_args_N + 1`
+  done
+}
+
+# Core function for launching the target application
+func_exec_program_core ()
+{
+
+      if test -n "$lt_option_debug"; then
+        $ECHO "gearman_execute_partition:docs/libgearman/examples/gearman_execute_partition:${LINENO}: newargv[0]: $progdir/$program" 1>&2
+        func_lt_dump_args ${1+"$@"} 1>&2
+      fi
+      exec "$progdir/$program" ${1+"$@"}
+
+      $ECHO "$0: cannot exec $program $*" 1>&2
+      exit 1
+}
+
+# A function to encapsulate launching the target application
+# Strips options in the --lt-* namespace from $@ and
+# launches target application with the remaining arguments.
+func_exec_program ()
+{
+  for lt_wr_arg
+  do
+    case $lt_wr_arg in
+    --lt-*) ;;
+    *) set x "$@" "$lt_wr_arg"; shift;;
+    esac
+    shift
+  done
+  func_exec_program_core ${1+"$@"}
+}
+
+  # Parse options
+  func_parse_lt_options "$0" ${1+"$@"}
+
+  # Find the directory that this script lives in.
+  thisdir=`$ECHO "$file" | /bin/sed 's%/[^/]*$%%'`
+  test "x$thisdir" = "x$file" && thisdir=.
+
+  # Follow symbolic links until we get to the real thisdir.
+  file=`ls -ld "$file" | /bin/sed -n 's/.*-> //p'`
+  while test -n "$file"; do
+    destdir=`$ECHO "$file" | /bin/sed 's%/[^/]*$%%'`
+
+    # If there was a directory component, then change thisdir.
+    if test "x$destdir" != "x$file"; then
+      case "$destdir" in
+      [\\/]* | [A-Za-z]:[\\/]*) thisdir="$destdir" ;;
+      *) thisdir="$thisdir/$destdir" ;;
+      esac
+    fi
+
+    file=`$ECHO "$file" | /bin/sed 's%^.*/%%'`
+    file=`ls -ld "$thisdir/$file" | /bin/sed -n 's/.*-> //p'`
+  done
+
+  # Usually 'no', except on cygwin/mingw when embedded into
+  # the cwrapper.
+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=no
+  if test "$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR" = "yes"; then
+    # special case for '.'
+    if test "$thisdir" = "."; then
+      thisdir=`pwd`
+    fi
+    # remove .libs from thisdir
+    case "$thisdir" in
+    *[\\/].libs ) thisdir=`$ECHO "$thisdir" | /bin/sed 's%[\\/][^\\/]*$%%'` ;;
+    .libs )   thisdir=. ;;
+    esac
+  fi
+
+  # Try to get the absolute directory name.
+  absdir=`cd "$thisdir" && pwd`
+  test -n "$absdir" && thisdir="$absdir"
+
+  program=lt-'gearman_execute_partition'
+  progdir="$thisdir/.libs"
+
+  if test ! -f "$progdir/$program" ||
+     { file=`ls -1dt "$progdir/$program" "$progdir/../$program" 2>/dev/null | /bin/sed 1q`; \
+       test "X$file" != "X$progdir/$program"; }; then
+
+    file="$$-$program"
+
+    if test ! -d "$progdir"; then
+      mkdir "$progdir"
+    else
+      rm -f "$progdir/$file"
+    fi
+
+    # relink executable if necessary
+    if test -n "$relink_command"; then
+      if relink_command_output=`eval $relink_command 2>&1`; then :
+      else
+	printf %s\n "$relink_command_output" >&2
+	rm -f "$progdir/$file"
+	exit 1
+      fi
+    fi
+
+    mv -f "$progdir/$file" "$progdir/$program" 2>/dev/null ||
+    { rm -f "$progdir/$program";
+      mv -f "$progdir/$file" "$progdir/$program"; }
+    rm -f "$progdir/$file"
+  fi
+
+  if test -f "$progdir/$program"; then
+    if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
+      # Run the actual program with our arguments.
+      func_exec_program ${1+"$@"}
+    fi
+  else
+    # The program doesn't exist.
+    $ECHO "$0: error: \`$progdir/$program' does not exist" 1>&2
+    $ECHO "This script is just a wrapper for $program." 1>&2
+    $ECHO "See the libtool documentation for more information." 1>&2
+    exit 1
+  fi
+fi

+ 6 - 6
docs/libgearman/examples/gearman_execute_map_reduce.c → docs/libgearman/examples/gearman_execute_partition.c

@@ -19,13 +19,13 @@ int main(void)
   }
 
   gearman_argument_t value= gearman_argument_make(0, 0, "this dog does not hunt", strlen("this dog does not hunt"));
-  gearman_work_t workload= gearman_work_map("word_split", strlen("word_split"), GEARMAN_JOB_PRIORITY_NORMAL);
 
-  gearman_task_st *task= gearman_execute(client, 
-                                         "count", strlen("count"),  // function
-                                         NULL, 0,  // no unique value provided
-                                         &workload, 
-                                         &value);
+  gearman_task_st *task= gearman_execute_by_partition(client, 
+                                                      "word_split", strlen("word_split"),
+                                                      "count", strlen("count"),  // function
+                                                      NULL, 0,  // no unique value provided
+                                                      NULL,
+                                                      &value, 0);
 
   if (task == NULL) // If gearman_execute() can return NULL on error
   {

+ 3 - 1
docs/libgearman/gearman_execute.rst

@@ -9,7 +9,9 @@ SYNOPSIS
 
 #include <libgearman/gearman.h>
 
-.. c:function:: gearman_task_st *gearman_execute(gearman_client_st *client, const char *function_name, size_t function_name_length, const char *unique_str, size_t unique_length, gearman_work_t *workload, gearman_argument_t *arguments)
+.. c:function:: gearman_task_st *gearman_execute(gearman_client_st *client, const char *function_name, size_t function_name_length, const char *unique, size_t unique_length, gearman_work_t *workload, gearman_argument_t *arguments, void *context)
+
+.. c:function:: gearman_task_st *gearman_execute_by_partition(gearman_client_st *client, const char *partition_function, const size_t partition_function_length, const char *function_name, const size_t function_name_length, const char *unique_str, const size_t unique_length, gearman_work_t *workload, gearman_argument_t *arguments, void *context)
 
 Link with -lgearman
 

+ 0 - 10
docs/libgearman/gearman_work_t.rst → docs/libgearman/gearman_task_attr_t.rst

@@ -16,14 +16,6 @@ SYNOPSIS
 
 .. c:function:: gearman_work_t gearman_work_background(gearman_job_priority_t priority);
 
-.. c:function:: gearman_work_t gearman_work_map(const char *name, size_t name_length, gearman_job_priority_t priority);
-
-.. c:function:: gearman_work_t gearman_work_epoch_with_map(time_t epoch, gearman_job_priority_t priority, const char *name, size_t name_length);
-
-.. c:function:: gearman_work_t gearman_work_background_with_map(gearman_job_priority_t priority, const char *name, size_t name_length);
-
-.. c:function:: void gearman_work_set_context(gearman_work_t *, void *);
-
 Compile and link with -lgearman
 
 -----------
@@ -38,8 +30,6 @@ DESCRIPTION
 
 :c:func:`gearman_work_background()` creates a :c:type:`gearman_work_t` which tells :c:func:`gearman_execute()` to execute the workload as a background job.
 
-:c:func:`gearman_work_map()`, :c:func:`gearman_work_map()`, and :c:func:`gearman_work_map()`, do the same as there non-map counterparts but specify a map function that will be executed on the result of the function specified for :c:func:`gearman_execute()`.
-
 --------
 SEE ALSO
 --------

+ 1 - 1
docs/man/gearadmin.1

@@ -1,4 +1,4 @@
-.TH "GEARADMIN" "1" "June 17, 2011" "0.22" "Gearmand"
+.TH "GEARADMIN" "1" "June 18, 2011" "0.22" "Gearmand"
 .SH NAME
 gearadmin \- Gearmand Documentation, http://gearman.info/
 .

Some files were not shown because too many files changed in this diff