client.h   client.h 
skipping to change at line 73 skipping to change at line 73
* @ingroup gearman_client * @ingroup gearman_client
*/ */
struct gearman_client_st struct gearman_client_st
{ {
struct { struct {
bool allocated; bool allocated;
bool non_blocking; bool non_blocking;
bool unbuffered_result; bool unbuffered_result;
bool no_new; bool no_new;
bool free_tasks; bool free_tasks;
bool generate_unique;
} options; } options;
enum gearman_client_t state; enum gearman_client_t state;
uint32_t new_tasks; uint32_t new_tasks;
uint32_t running_tasks; uint32_t running_tasks;
uint32_t task_count; uint32_t task_count;
void *context; void *context;
gearman_connection_st *con; gearman_connection_st *con;
gearman_task_st *task; gearman_task_st *task;
gearman_task_st *task_list; gearman_task_st *task_list;
gearman_task_context_free_fn *task_context_free_fn; gearman_task_context_free_fn *task_context_free_fn;
skipping to change at line 720 skipping to change at line 721
/** /**
* Run tasks that have been added in parallel. * Run tasks that have been added in parallel.
* *
* @param[in] client Structure previously initialized with * @param[in] client Structure previously initialized with
* gearman_client_create() or gearman_client_clone(). * gearman_client_create() or gearman_client_clone().
* @return Standard gearman return value. * @return Standard gearman return value.
*/ */
GEARMAN_API GEARMAN_API
gearman_return_t gearman_client_run_tasks(gearman_client_st *client); gearman_return_t gearman_client_run_tasks(gearman_client_st *client);
GEARMAN_LOCAL
gearman_return_t gearman_client_run_block_tasks(gearman_client_st *client);
GEARMAN_API GEARMAN_API
bool gearman_client_compare(const gearman_client_st *first, const gearman_c lient_st *second); bool gearman_client_compare(const gearman_client_st *first, const gearman_c lient_st *second);
GEARMAN_API GEARMAN_API
bool gearman_client_set_server_option(gearman_client_st *self, const char * option_arg, size_t option_arg_size); bool gearman_client_set_server_option(gearman_client_st *self, const char * option_arg, size_t option_arg_size);
GEARMAN_LOCAL
size_t gearman_client_count_tasks(gearman_client_st *client);
GEARMAN_API GEARMAN_API
void gearman_client_set_namespace(gearman_client_st *self, const char *name space_key, size_t namespace_key_size); void gearman_client_set_namespace(gearman_client_st *self, const char *name space_key, size_t namespace_key_size);
GEARMAN_API GEARMAN_API
gearman_return_t gearman_client_set_identifier(gearman_client_st *client, gearman_return_t gearman_client_set_identifier(gearman_client_st *client,
const char *id, size_t id_si ze); const char *id, size_t id_si ze);
const char *gearman_client_namespace(gearman_client_st *self); const char *gearman_client_namespace(gearman_client_st *self);
/** @} */ /** @} */
 End of changes. 3 change blocks. 
6 lines changed or deleted 1 lines changed or added


 constants.h   constants.h 
skipping to change at line 111 skipping to change at line 111
* Options for gearman_client_st. * Options for gearman_client_st.
*/ */
typedef enum typedef enum
{ {
GEARMAN_CLIENT_ALLOCATED= (1 << 0), GEARMAN_CLIENT_ALLOCATED= (1 << 0),
GEARMAN_CLIENT_NON_BLOCKING= (1 << 1), GEARMAN_CLIENT_NON_BLOCKING= (1 << 1),
GEARMAN_CLIENT_TASK_IN_USE= (1 << 2), GEARMAN_CLIENT_TASK_IN_USE= (1 << 2),
GEARMAN_CLIENT_UNBUFFERED_RESULT= (1 << 3), GEARMAN_CLIENT_UNBUFFERED_RESULT= (1 << 3),
GEARMAN_CLIENT_NO_NEW= (1 << 4), GEARMAN_CLIENT_NO_NEW= (1 << 4),
GEARMAN_CLIENT_FREE_TASKS= (1 << 5), GEARMAN_CLIENT_FREE_TASKS= (1 << 5),
GEARMAN_CLIENT_MAX= (1 << 6) GEARMAN_CLIENT_GENERATE_UNIQUE= (1 << 6),
GEARMAN_CLIENT_MAX= (1 << 7)
} gearman_client_options_t; } gearman_client_options_t;
/** /**
* @ingroup gearman_worker * @ingroup gearman_worker
* Options for gearman_worker_st. * Options for gearman_worker_st.
*/ */
typedef enum typedef enum
{ {
GEARMAN_WORKER_ALLOCATED= (1 << 0), GEARMAN_WORKER_ALLOCATED= (1 << 0),
GEARMAN_WORKER_NON_BLOCKING= (1 << 1), GEARMAN_WORKER_NON_BLOCKING= (1 << 1),
 End of changes. 1 change blocks. 
1 lines changed or deleted 2 lines changed or added


 function.h   function.h 
skipping to change at line 87 skipping to change at line 87
typedef struct gearman_function_t gearman_function_t; typedef struct gearman_function_t gearman_function_t;
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
GEARMAN_API GEARMAN_API
gearman_function_t gearman_function_create(gearman_function_fn func); gearman_function_t gearman_function_create(gearman_function_fn func);
GEARMAN_LOCAL
gearman_function_t gearman_function_create_null(void);
GEARMAN_API GEARMAN_API
gearman_function_t gearman_function_create_partition(gearman_function_fn func, gearman_function_t gearman_function_create_partition(gearman_function_fn func,
gearman_aggregator_f n aggregator); gearman_aggregator_f n aggregator);
GEARMAN_API GEARMAN_API
gearman_function_t gearman_function_create_v1(gearman_worker_fn func); gearman_function_t gearman_function_create_v1(gearman_worker_fn func);
GEARMAN_API GEARMAN_API
gearman_function_t gearman_function_create_v2(gearman_function_fn func); gearman_function_t gearman_function_create_v2(gearman_function_fn func);
 End of changes. 1 change blocks. 
3 lines changed or deleted 0 lines changed or added


 ostream.hpp   ostream.hpp 
skipping to change at line 49 skipping to change at line 49
#include <libgearman-1.0/gearman.h> #include <libgearman-1.0/gearman.h>
#include <ostream> #include <ostream>
static inline std::ostream& operator<<(std::ostream& output, const enum gea rman_return_t &arg) static inline std::ostream& operator<<(std::ostream& output, const enum gea rman_return_t &arg)
{ {
output << gearman_strerror(arg); output << gearman_strerror(arg);
return output; return output;
} }
static inline std::ostream& operator<<(std::ostream& output, const gearman_
packet_st &arg)
{
const char* command_str;
switch(arg.command)
{
case GEARMAN_COMMAND_TEXT: command_str= "GEARMAN_COMMAND_TEXT";
case GEARMAN_COMMAND_CAN_DO: command_str= "GEARMAN_COMMAND_CAN_DO";
case GEARMAN_COMMAND_CANT_DO: command_str= "GEARMAN_COMMAND_CANT_DO";
case GEARMAN_COMMAND_RESET_ABILITIES: command_str= "GEARMAN_COMMAND_RESE
T_ABILITIES";
case GEARMAN_COMMAND_PRE_SLEEP: command_str= "GEARMAN_COMMAND_PRE_SLEEP"
;
case GEARMAN_COMMAND_UNUSED: command_str= "GEARMAN_COMMAND_UNUSED";
case GEARMAN_COMMAND_NOOP: command_str= "GEARMAN_COMMAND_NOOP";
case GEARMAN_COMMAND_SUBMIT_JOB: command_str= "GEARMAN_COMMAND_SUBMIT_JO
B";
case GEARMAN_COMMAND_JOB_CREATED: command_str= "GEARMAN_COMMAND_JOB_CREA
TED";
case GEARMAN_COMMAND_GRAB_JOB: command_str= "GEARMAN_COMMAND_GRAB_JOB";
case GEARMAN_COMMAND_NO_JOB: command_str= "GEARMAN_COMMAND_NO_JOB";
case GEARMAN_COMMAND_JOB_ASSIGN: command_str= "GEARMAN_COMMAND_JOB_ASSIG
N";
case GEARMAN_COMMAND_WORK_STATUS: command_str= "GEARMAN_COMMAND_WORK_STA
TUS";
case GEARMAN_COMMAND_WORK_COMPLETE: command_str= "GEARMAN_COMMAND_WORK_C
OMPLETE";
case GEARMAN_COMMAND_WORK_FAIL: command_str= "GEARMAN_COMMAND_WORK_FAIL"
;
case GEARMAN_COMMAND_GET_STATUS: command_str= "GEARMAN_COMMAND_GET_STATU
S";
case GEARMAN_COMMAND_ECHO_REQ: command_str= "GEARMAN_COMMAND_ECHO_REQ";
case GEARMAN_COMMAND_ECHO_RES: command_str= "GEARMAN_COMMAND_ECHO_RES";
case GEARMAN_COMMAND_SUBMIT_JOB_BG: command_str= "GEARMAN_COMMAND_SUBMIT
_JOB_BG";
case GEARMAN_COMMAND_ERROR: command_str= "GEARMAN_COMMAND_ERROR";
case GEARMAN_COMMAND_STATUS_RES: command_str= "GEARMAN_COMMAND_STATUS_RE
S";
case GEARMAN_COMMAND_SUBMIT_JOB_HIGH: command_str= "GEARMAN_COMMAND_SUBM
IT_JOB_HIGH";
case GEARMAN_COMMAND_SET_CLIENT_ID: command_str= "GEARMAN_COMMAND_SET_CL
IENT_ID";
case GEARMAN_COMMAND_CAN_DO_TIMEOUT: command_str= "GEARMAN_COMMAND_CAN_D
O_TIMEOUT";
case GEARMAN_COMMAND_ALL_YOURS: command_str= "GEARMAN_COMMAND_ALL_YOURS"
;
case GEARMAN_COMMAND_WORK_EXCEPTION: command_str= "GEARMAN_COMMAND_WORK_
EXCEPTION";
case GEARMAN_COMMAND_OPTION_REQ: command_str= "GEARMAN_COMMAND_OPTION_RE
Q";
case GEARMAN_COMMAND_OPTION_RES: command_str= "GEARMAN_COMMAND_OPTION_RE
S";
case GEARMAN_COMMAND_WORK_DATA: command_str= "GEARMAN_COMMAND_WORK_DATA"
;
case GEARMAN_COMMAND_WORK_WARNING: command_str= "GEARMAN_COMMAND_WORK_WA
RNING";
case GEARMAN_COMMAND_GRAB_JOB_UNIQ: command_str= "GEARMAN_COMMAND_GRAB_J
OB_UNIQ";
case GEARMAN_COMMAND_JOB_ASSIGN_UNIQ: command_str= "GEARMAN_COMMAND_JOB_
ASSIGN_UNIQ";
case GEARMAN_COMMAND_SUBMIT_JOB_HIGH_BG: command_str= "GEARMAN_COMMAND_S
UBMIT_JOB_HIGH_BG";
case GEARMAN_COMMAND_SUBMIT_JOB_LOW: command_str= "GEARMAN_COMMAND_SUBMI
T_JOB_LOW";
case GEARMAN_COMMAND_SUBMIT_JOB_LOW_BG: command_str= "GEARMAN_COMMAND_SU
BMIT_JOB_LOW_BG";
case GEARMAN_COMMAND_SUBMIT_JOB_SCHED: command_str= "GEARMAN_COMMAND_SUB
MIT_JOB_SCHED";
case GEARMAN_COMMAND_SUBMIT_JOB_EPOCH: command_str= "GEARMAN_COMMAND_SUB
MIT_JOB_EPOCH";
case GEARMAN_COMMAND_SUBMIT_REDUCE_JOB: command_str= "GEARMAN_COMMAND_SU
BMIT_REDUCE_JOB";
case GEARMAN_COMMAND_SUBMIT_REDUCE_JOB_BACKGROUND: command_str= "GEARMAN
_COMMAND_SUBMIT_REDUCE_JOB_BACKGROUND";
case GEARMAN_COMMAND_GRAB_JOB_ALL: command_str= "GEARMAN_COMMAND_GRAB_JO
B_ALL";
case GEARMAN_COMMAND_JOB_ASSIGN_ALL: command_str= "GEARMAN_COMMAND_JOB_A
SSIGN_ALL";
case GEARMAN_COMMAND_MAX: command_str= "GEARMAN_COMMAND_MAX";
case GEARMAN_COMMAND_GET_STATUS_UNIQUE: command_str= "GEARMAN_COMMAND_GE
T_STATUS_UNIQUE";
case GEARMAN_COMMAND_STATUS_RES_UNIQUE: command_str= "GEARMAN_COMMAND_ST
ATUS_RES_UNIQUE";
}
output << std::boolalpha
<< "command: " << command_str
<< " argc: " << int(arg.argc);
for (uint8_t x= 0; x < arg.argc; x++)
{
output << "arg[" << int(x) << "]: ";
output.write(arg.arg[x], arg.arg_size[x]);
output << " ";
}
return output;
}
static inline std::ostream& operator<<(std::ostream& output, const gearman_ task_st &arg) static inline std::ostream& operator<<(std::ostream& output, const gearman_ task_st &arg)
{ {
output << std::boolalpha output << std::boolalpha
<< "job: " << gearman_task_job_handle(&arg) << "job: " << gearman_task_job_handle(&arg)
<< " unique: " << gearman_task_unique(&arg) << " unique: " << gearman_task_unique(&arg)
<< " has_result:" << bool(arg.result_ptr)
<< " complete: " << gearman_task_numerator(&arg) << "/" << gearman_task _denominator(&arg) << " complete: " << gearman_task_numerator(&arg) << "/" << gearman_task _denominator(&arg)
<< " state: " << gearman_task_strstate(&arg) << " state: " << gearman_task_strstate(&arg)
<< " is_known: " << gearman_task_is_known(&arg) << " is_known: " << gearman_task_is_known(&arg)
<< " is_running: " << gearman_task_is_running(&arg) << " is_running: " << gearman_task_is_running(&arg)
<< " ret: " << gearman_task_return(&arg); << " ret: " << gearman_task_return(&arg);
if (arg.recv)
{
output << " " << *arg.recv;
}
return output; return output;
} }
static inline std::ostream& operator<<(std::ostream& output, const gearman_ status_t &arg) static inline std::ostream& operator<<(std::ostream& output, const gearman_ status_t &arg)
{ {
output << std::boolalpha output << std::boolalpha
<< " is_known: " << gearman_status_is_known(arg) << " is_known: " << gearman_status_is_known(arg)
<< " is_running: " << gearman_status_is_running(arg) << " is_running: " << gearman_status_is_running(arg)
<< " complete: " << gearman_status_numerator(arg) << "/" << gearman_sta tus_denominator(arg) << " complete: " << gearman_status_numerator(arg) << "/" << gearman_sta tus_denominator(arg)
<< " ret: " << gearman_strerror(gearman_status_return(arg)); << " ret: " << gearman_strerror(gearman_status_return(arg));
 End of changes. 3 change blocks. 
0 lines changed or deleted 105 lines changed or added


 task_attr.h   task_attr.h 
skipping to change at line 80 skipping to change at line 80
GEARMAN_API GEARMAN_API
gearman_task_attr_t gearman_task_attr_init(gearman_job_priority_t priorit y); gearman_task_attr_t gearman_task_attr_init(gearman_job_priority_t priorit y);
GEARMAN_API GEARMAN_API
gearman_task_attr_t gearman_task_attr_init_epoch(time_t epoch, gearman_jo b_priority_t priority); gearman_task_attr_t gearman_task_attr_init_epoch(time_t epoch, gearman_jo b_priority_t priority);
GEARMAN_API GEARMAN_API
gearman_task_attr_t gearman_task_attr_init_background(gearman_job_priorit y_t priority); gearman_task_attr_t gearman_task_attr_init_background(gearman_job_priorit y_t priority);
// Everything below here is private
GEARMAN_LOCAL
time_t gearman_task_attr_has_epoch(const gearman_task_attr_t *);
GEARMAN_LOCAL
gearman_job_priority_t gearman_task_attr_priority(const gearman_task_attr_t
*);
GEARMAN_LOCAL
bool gearman_task_attr_is_background(const gearman_task_attr_t *);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
 End of changes. 1 change blocks. 
12 lines changed or deleted 0 lines changed or added


 version.h   version.h 
skipping to change at line 40 skipping to change at line 40
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
*/ */
#pragma once #pragma once
#define LIBGEARMAN_VERSION_STRING "1.0.1" #define LIBGEARMAN_VERSION_STRING "1.0.2"
#define LIBGEARMAN_VERSION_HEX 0x01000001 #define LIBGEARMAN_VERSION_HEX 0x01000002
 End of changes. 1 change blocks. 
0 lines changed or deleted 0 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/