Merge lp:~brianaker/gearmand/gearman_connection_create-cleanup into lp:gearmand
- gearman_connection_create-cleanup
- Merge into 1.2
Proposed by
Brian Aker
Status: | Merged |
---|---|
Merged at revision: | 785 |
Proposed branch: | lp:~brianaker/gearmand/gearman_connection_create-cleanup |
Merge into: | lp:gearmand |
Diff against target: |
533 lines (+91/-138) 10 files modified
libgearman/add.cc (+2/-2) libgearman/backtrace.cc (+8/-9) libgearman/client.cc (+2/-2) libgearman/command.cc (+1/-1) libgearman/connection.cc (+26/-65) libgearman/connection.hpp (+16/-15) libgearman/worker.cc (+1/-1) tests/libgearman-1.0/internals.cc (+31/-31) tests/libgearman-1.0/regression.cc (+2/-6) tests/libgearman-1.0/worker_test.cc (+2/-6) |
To merge this branch: | bzr merge lp:~brianaker/gearmand/gearman_connection_create-cleanup |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tangent Trunk | Pending | ||
Review via email: mp+171438@code.launchpad.net |
Commit message
Description of the change
Cleanup patch
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'libgearman/add.cc' | |||
2 | --- libgearman/add.cc 2013-06-11 06:48:11 +0000 | |||
3 | +++ libgearman/add.cc 2013-06-25 23:50:39 +0000 | |||
4 | @@ -286,8 +286,8 @@ | |||
5 | 286 | 286 | ||
6 | 287 | case GEARMAN_COMMAND_SUBMIT_REDUCE_JOB: | 287 | case GEARMAN_COMMAND_SUBMIT_REDUCE_JOB: |
7 | 288 | case GEARMAN_COMMAND_SUBMIT_REDUCE_JOB_BACKGROUND: | 288 | case GEARMAN_COMMAND_SUBMIT_REDUCE_JOB_BACKGROUND: |
8 | 289 | assert(0); | ||
9 | 290 | rc= GEARMAN_INVALID_ARGUMENT; | 289 | rc= GEARMAN_INVALID_ARGUMENT; |
10 | 290 | assert(rc != GEARMAN_INVALID_ARGUMENT); | ||
11 | 291 | break; | 291 | break; |
12 | 292 | 292 | ||
13 | 293 | case GEARMAN_COMMAND_SUBMIT_JOB_SCHED: | 293 | case GEARMAN_COMMAND_SUBMIT_JOB_SCHED: |
14 | @@ -325,8 +325,8 @@ | |||
15 | 325 | case GEARMAN_COMMAND_WORK_WARNING: | 325 | case GEARMAN_COMMAND_WORK_WARNING: |
16 | 326 | case GEARMAN_COMMAND_GET_STATUS_UNIQUE: | 326 | case GEARMAN_COMMAND_GET_STATUS_UNIQUE: |
17 | 327 | case GEARMAN_COMMAND_STATUS_RES_UNIQUE: | 327 | case GEARMAN_COMMAND_STATUS_RES_UNIQUE: |
18 | 328 | assert(0); | ||
19 | 329 | rc= GEARMAN_INVALID_ARGUMENT; | 328 | rc= GEARMAN_INVALID_ARGUMENT; |
20 | 329 | assert(rc != GEARMAN_INVALID_ARGUMENT); | ||
21 | 330 | break; | 330 | break; |
22 | 331 | } | 331 | } |
23 | 332 | 332 | ||
24 | 333 | 333 | ||
25 | === modified file 'libgearman/backtrace.cc' | |||
26 | --- libgearman/backtrace.cc 2013-01-17 19:38:43 +0000 | |||
27 | +++ libgearman/backtrace.cc 2013-06-25 23:50:39 +0000 | |||
28 | @@ -51,13 +51,12 @@ | |||
29 | 51 | 51 | ||
30 | 52 | #ifdef HAVE_GCC_ABI_DEMANGLE | 52 | #ifdef HAVE_GCC_ABI_DEMANGLE |
31 | 53 | # include <cxxabi.h> | 53 | # include <cxxabi.h> |
39 | 54 | # define USE_DEMANGLE 1 | 54 | # ifdef HAVE_DLFCN_H |
40 | 55 | #else | 55 | # define USE_DEMANGLE 1 |
41 | 56 | # define USE_DEMANGLE 0 | 56 | # include <dlfcn.h> |
42 | 57 | #endif | 57 | # else |
43 | 58 | 58 | # define USE_DEMANGLE 0 | |
44 | 59 | #ifdef HAVE_DLFCN_H | 59 | # endif |
38 | 60 | # include <dlfcn.h> | ||
45 | 61 | #endif | 60 | #endif |
46 | 62 | 61 | ||
47 | 63 | const int MAX_DEPTH= 50; | 62 | const int MAX_DEPTH= 50; |
48 | @@ -78,9 +77,9 @@ | |||
49 | 78 | { | 77 | { |
50 | 79 | bool was_demangled= false; | 78 | bool was_demangled= false; |
51 | 80 | 79 | ||
52 | 80 | #if defined(USE_DEMANGLE) | ||
53 | 81 | if (USE_DEMANGLE) | 81 | if (USE_DEMANGLE) |
54 | 82 | { | 82 | { |
55 | 83 | #ifdef HAVE_DLFCN_H | ||
56 | 84 | Dl_info dlinfo; | 83 | Dl_info dlinfo; |
57 | 85 | if (dladdr(backtrace_buffer[x], &dlinfo)) | 84 | if (dladdr(backtrace_buffer[x], &dlinfo)) |
58 | 86 | { | 85 | { |
59 | @@ -108,8 +107,8 @@ | |||
60 | 108 | dlinfo.dli_fname); | 107 | dlinfo.dli_fname); |
61 | 109 | } | 108 | } |
62 | 110 | } | 109 | } |
63 | 111 | #endif | ||
64 | 112 | } | 110 | } |
65 | 111 | #endif // USE_DEMANGLE | ||
66 | 113 | 112 | ||
67 | 114 | if (was_demangled == false) | 113 | if (was_demangled == false) |
68 | 115 | { | 114 | { |
69 | 116 | 115 | ||
70 | === modified file 'libgearman/client.cc' | |||
71 | --- libgearman/client.cc 2013-06-15 09:06:53 +0000 | |||
72 | +++ libgearman/client.cc 2013-06-25 23:50:39 +0000 | |||
73 | @@ -593,7 +593,7 @@ | |||
74 | 593 | { | 593 | { |
75 | 594 | if (client_shell and client_shell->impl()) | 594 | if (client_shell and client_shell->impl()) |
76 | 595 | { | 595 | { |
78 | 596 | if (gearman_connection_create_args(client_shell->impl()->universal, host, port) == false) | 596 | if (gearman_connection_create(client_shell->impl()->universal, host, port) == false) |
79 | 597 | { | 597 | { |
80 | 598 | assert(client_shell->impl()->universal.error_code() != GEARMAN_SUCCESS); | 598 | assert(client_shell->impl()->universal.error_code() != GEARMAN_SUCCESS); |
81 | 599 | return client_shell->impl()->universal.error_code(); | 599 | return client_shell->impl()->universal.error_code(); |
82 | @@ -608,7 +608,7 @@ | |||
83 | 608 | 608 | ||
84 | 609 | gearman_return_t Client::add_server(const char *host, const char* service_) | 609 | gearman_return_t Client::add_server(const char *host, const char* service_) |
85 | 610 | { | 610 | { |
87 | 611 | if (gearman_connection_create_args(universal, host, service_) == false) | 611 | if (gearman_connection_create(universal, host, service_) == false) |
88 | 612 | { | 612 | { |
89 | 613 | assert(universal.error_code() != GEARMAN_SUCCESS); | 613 | assert(universal.error_code() != GEARMAN_SUCCESS); |
90 | 614 | return universal.error_code(); | 614 | return universal.error_code(); |
91 | 615 | 615 | ||
92 | === modified file 'libgearman/command.cc' | |||
93 | --- libgearman/command.cc 2013-05-11 23:09:32 +0000 | |||
94 | +++ libgearman/command.cc 2013-06-25 23:50:39 +0000 | |||
95 | @@ -109,7 +109,7 @@ | |||
96 | 109 | } | 109 | } |
97 | 110 | 110 | ||
98 | 111 | assert(0); // We should never reach this | 111 | assert(0); // We should never reach this |
100 | 112 | abort(); | 112 | return "__UNKNOWN"; |
101 | 113 | } | 113 | } |
102 | 114 | 114 | ||
103 | 115 | const gearman_command_info_st *gearman_command_info(gearman_command_t command) | 115 | const gearman_command_info_st *gearman_command_info(gearman_command_t command) |
104 | 116 | 116 | ||
105 | === modified file 'libgearman/connection.cc' | |||
106 | --- libgearman/connection.cc 2013-06-14 21:52:52 +0000 | |||
107 | +++ libgearman/connection.cc 2013-06-25 23:50:39 +0000 | |||
108 | @@ -79,35 +79,6 @@ | |||
109 | 79 | # define MSG_DONTWAIT 0 | 79 | # define MSG_DONTWAIT 0 |
110 | 80 | #endif | 80 | #endif |
111 | 81 | 81 | ||
112 | 82 | static gearman_return_t gearman_connection_set_option(gearman_connection_st *connection, | ||
113 | 83 | gearman_connection_options_t options, | ||
114 | 84 | bool value) | ||
115 | 85 | { | ||
116 | 86 | switch (options) | ||
117 | 87 | { | ||
118 | 88 | case GEARMAN_CON_READY: | ||
119 | 89 | connection->options.ready= value; | ||
120 | 90 | break; | ||
121 | 91 | |||
122 | 92 | case GEARMAN_CON_PACKET_IN_USE: | ||
123 | 93 | connection->options.packet_in_use= value; | ||
124 | 94 | break; | ||
125 | 95 | |||
126 | 96 | case GEARMAN_CON_IGNORE_LOST_CONNECTION: | ||
127 | 97 | break; | ||
128 | 98 | |||
129 | 99 | case GEARMAN_CON_CLOSE_AFTER_FLUSH: | ||
130 | 100 | break; | ||
131 | 101 | |||
132 | 102 | case GEARMAN_CON_EXTERNAL_FD: | ||
133 | 103 | case GEARMAN_CON_MAX: | ||
134 | 104 | default: | ||
135 | 105 | return GEARMAN_INVALID_COMMAND; | ||
136 | 106 | } | ||
137 | 107 | |||
138 | 108 | return GEARMAN_SUCCESS; | ||
139 | 109 | } | ||
140 | 110 | |||
141 | 111 | 82 | ||
142 | 112 | /** | 83 | /** |
143 | 113 | * @addtogroup gearman_connection_static Static Connection Declarations | 84 | * @addtogroup gearman_connection_static Static Connection Declarations |
144 | @@ -115,8 +86,7 @@ | |||
145 | 115 | * @{ | 86 | * @{ |
146 | 116 | */ | 87 | */ |
147 | 117 | 88 | ||
150 | 118 | gearman_connection_st::gearman_connection_st(gearman_universal_st &universal_arg, | 89 | gearman_connection_st::gearman_connection_st(gearman_universal_st &universal_arg) : |
149 | 119 | gearman_connection_options_t *options_args) : | ||
151 | 120 | state(GEARMAN_CON_UNIVERSAL_ADDRINFO), | 90 | state(GEARMAN_CON_UNIVERSAL_ADDRINFO), |
152 | 121 | send_state(GEARMAN_CON_SEND_STATE_NONE), | 91 | send_state(GEARMAN_CON_SEND_STATE_NONE), |
153 | 122 | recv_state(GEARMAN_CON_RECV_UNIVERSAL_NONE), | 92 | recv_state(GEARMAN_CON_RECV_UNIVERSAL_NONE), |
154 | @@ -142,15 +112,6 @@ | |||
155 | 142 | send_buffer_ptr(NULL), | 112 | send_buffer_ptr(NULL), |
156 | 143 | _recv_packet(NULL) | 113 | _recv_packet(NULL) |
157 | 144 | { | 114 | { |
158 | 145 | if (options_args) | ||
159 | 146 | { | ||
160 | 147 | while (*options_args != GEARMAN_CON_MAX) | ||
161 | 148 | { | ||
162 | 149 | gearman_connection_set_option(this, *options_args, true); | ||
163 | 150 | options_args++; | ||
164 | 151 | } | ||
165 | 152 | } | ||
166 | 153 | |||
167 | 154 | if (universal.con_list) | 115 | if (universal.con_list) |
168 | 155 | { | 116 | { |
169 | 156 | universal.con_list->prev= this; | 117 | universal.con_list->prev= this; |
170 | @@ -165,10 +126,14 @@ | |||
171 | 165 | _service[0]= 0; | 126 | _service[0]= 0; |
172 | 166 | } | 127 | } |
173 | 167 | 128 | ||
176 | 168 | gearman_connection_st *gearman_connection_create(gearman_universal_st &universal, | 129 | /** |
177 | 169 | gearman_connection_options_t *options) | 130 | * Initialize a connection structure. Always check the return value even if |
178 | 131 | * passing in a pre-allocated structure. Some other initialization may have | ||
179 | 132 | * failed. | ||
180 | 133 | */ | ||
181 | 134 | static gearman_connection_st *__connection_create(gearman_universal_st &universal) | ||
182 | 170 | { | 135 | { |
184 | 171 | gearman_connection_st *connection= new (std::nothrow) gearman_connection_st(universal, options); | 136 | gearman_connection_st *connection= new (std::nothrow) gearman_connection_st(universal); |
185 | 172 | if (connection == NULL) | 137 | if (connection == NULL) |
186 | 173 | { | 138 | { |
187 | 174 | gearman_perror(universal, "Failed at new() gearman_connection_st new"); | 139 | gearman_perror(universal, "Failed at new() gearman_connection_st new"); |
188 | @@ -177,38 +142,34 @@ | |||
189 | 177 | return connection; | 142 | return connection; |
190 | 178 | } | 143 | } |
191 | 179 | 144 | ||
194 | 180 | gearman_connection_st *gearman_connection_create_args(gearman_universal_st& universal, | 145 | gearman_connection_st *gearman_connection_create(gearman_universal_st& universal, |
195 | 181 | const char *host, const char* service_) | 146 | const char *host, const char* service_) |
196 | 182 | { | 147 | { |
210 | 183 | gearman_connection_st *connection= gearman_connection_create(universal); | 148 | gearman_connection_st *connection= __connection_create(universal); |
211 | 184 | if (connection == NULL) | 149 | if (connection) |
212 | 185 | { | 150 | { |
213 | 186 | return NULL; | 151 | connection->set_host(host, (const char*)service_); |
214 | 187 | } | 152 | |
215 | 188 | 153 | if (gearman_failed(connection->lookup())) | |
216 | 189 | connection->set_host(host, service_); | 154 | { |
217 | 190 | 155 | delete connection; | |
218 | 191 | if (gearman_failed(connection->lookup())) | 156 | return NULL; |
219 | 192 | { | 157 | } |
207 | 193 | gearman_gerror(universal, GEARMAN_GETADDRINFO); | ||
208 | 194 | delete connection; | ||
209 | 195 | return NULL; | ||
220 | 196 | } | 158 | } |
221 | 197 | 159 | ||
222 | 198 | return connection; | 160 | return connection; |
223 | 199 | } | 161 | } |
224 | 200 | 162 | ||
227 | 201 | gearman_connection_st *gearman_connection_create_args(gearman_universal_st& universal, | 163 | gearman_connection_st *gearman_connection_create(gearman_universal_st& universal, |
228 | 202 | const char *host, in_port_t port) | 164 | const char *host, const in_port_t& port) |
229 | 203 | { | 165 | { |
231 | 204 | gearman_connection_st *connection= gearman_connection_create(universal, NULL); | 166 | gearman_connection_st *connection= __connection_create(universal); |
232 | 205 | if (connection) | 167 | if (connection) |
233 | 206 | { | 168 | { |
234 | 207 | connection->set_host(host, port); | 169 | connection->set_host(host, port); |
235 | 208 | 170 | ||
236 | 209 | if (gearman_failed(connection->lookup())) | 171 | if (gearman_failed(connection->lookup())) |
237 | 210 | { | 172 | { |
238 | 211 | gearman_gerror(universal, GEARMAN_GETADDRINFO); | ||
239 | 212 | delete connection; | 173 | delete connection; |
240 | 213 | return NULL; | 174 | return NULL; |
241 | 214 | } | 175 | } |
242 | @@ -220,7 +181,7 @@ | |||
243 | 220 | gearman_connection_st *gearman_connection_copy(gearman_universal_st& universal, | 181 | gearman_connection_st *gearman_connection_copy(gearman_universal_st& universal, |
244 | 221 | const gearman_connection_st& from) | 182 | const gearman_connection_st& from) |
245 | 222 | { | 183 | { |
247 | 223 | gearman_connection_st *connection= gearman_connection_create(universal); | 184 | gearman_connection_st *connection= __connection_create(universal); |
248 | 224 | 185 | ||
249 | 225 | if (connection) | 186 | if (connection) |
250 | 226 | { | 187 | { |
251 | @@ -278,7 +239,7 @@ | |||
252 | 278 | * Public Definitions | 239 | * Public Definitions |
253 | 279 | */ | 240 | */ |
254 | 280 | 241 | ||
256 | 281 | void gearman_connection_st::set_host(const char *host_, const in_port_t& port_) | 242 | void gearman_connection_st::set_host(const char *host_, const in_port_t port_) |
257 | 282 | { | 243 | { |
258 | 283 | if (port_ < 1) | 244 | if (port_ < 1) |
259 | 284 | { | 245 | { |
260 | @@ -683,7 +644,7 @@ | |||
261 | 683 | if ((ret= getaddrinfo(_host, _service, &ai, &(_addrinfo)))) | 644 | if ((ret= getaddrinfo(_host, _service, &ai, &(_addrinfo)))) |
262 | 684 | { | 645 | { |
263 | 685 | reset_addrinfo(); | 646 | reset_addrinfo(); |
265 | 686 | return gearman_universal_set_error(universal, GEARMAN_GETADDRINFO, GEARMAN_AT, "getaddrinfo:%s", gai_strerror(ret)); | 647 | return gearman_universal_set_error(universal, GEARMAN_GETADDRINFO, GEARMAN_AT, "%s:%d getaddrinfo:%s", host(), service(), gai_strerror(ret)); |
266 | 687 | } | 648 | } |
267 | 688 | 649 | ||
268 | 689 | addrinfo_next= _addrinfo; | 650 | addrinfo_next= _addrinfo; |
269 | 690 | 651 | ||
270 | === modified file 'libgearman/connection.hpp' | |||
271 | --- libgearman/connection.hpp 2013-06-11 01:05:38 +0000 | |||
272 | +++ libgearman/connection.hpp 2013-06-25 23:50:39 +0000 | |||
273 | @@ -115,14 +115,23 @@ | |||
274 | 115 | 115 | ||
275 | 116 | void free_private_packet(); | 116 | void free_private_packet(); |
276 | 117 | 117 | ||
279 | 118 | gearman_connection_st(gearman_universal_st &universal_arg, | 118 | gearman_connection_st(gearman_universal_st &universal_arg); |
278 | 119 | gearman_connection_options_t *options); | ||
280 | 120 | 119 | ||
281 | 121 | ~gearman_connection_st(); | 120 | ~gearman_connection_st(); |
282 | 122 | 121 | ||
284 | 123 | void set_host( const char *host, const in_port_t& port); | 122 | void set_host( const char *host, const in_port_t port); |
285 | 124 | void set_host( const char *host, const char* service); | 123 | void set_host( const char *host, const char* service); |
286 | 125 | 124 | ||
287 | 125 | const char* host(void) const | ||
288 | 126 | { | ||
289 | 127 | return _host; | ||
290 | 128 | } | ||
291 | 129 | |||
292 | 130 | const char* service(void) const | ||
293 | 131 | { | ||
294 | 132 | return _service; | ||
295 | 133 | } | ||
296 | 134 | |||
297 | 126 | gearman_return_t send_packet(const gearman_packet_st&, const bool flush_buffer); | 135 | gearman_return_t send_packet(const gearman_packet_st&, const bool flush_buffer); |
298 | 127 | size_t send_and_flush(const void *data, size_t data_size, gearman_return_t *ret_ptr); | 136 | size_t send_and_flush(const void *data, size_t data_size, gearman_return_t *ret_ptr); |
299 | 128 | 137 | ||
300 | @@ -172,14 +181,6 @@ | |||
301 | 172 | gearman_packet_st *_recv_packet; | 181 | gearman_packet_st *_recv_packet; |
302 | 173 | }; | 182 | }; |
303 | 174 | 183 | ||
304 | 175 | /** | ||
305 | 176 | * Initialize a connection structure. Always check the return value even if | ||
306 | 177 | * passing in a pre-allocated structure. Some other initialization may have | ||
307 | 178 | * failed. | ||
308 | 179 | */ | ||
309 | 180 | gearman_connection_st *gearman_connection_create(gearman_universal_st &universal, | ||
310 | 181 | gearman_connection_options_t *options= NULL); | ||
311 | 182 | |||
312 | 183 | gearman_connection_st *gearman_connection_copy(gearman_universal_st& universal, | 184 | gearman_connection_st *gearman_connection_copy(gearman_universal_st& universal, |
313 | 184 | const gearman_connection_st& from); | 185 | const gearman_connection_st& from); |
314 | 185 | 186 | ||
315 | @@ -194,8 +195,8 @@ | |||
316 | 194 | * @return On success, a pointer to the (possibly allocated) structure. On | 195 | * @return On success, a pointer to the (possibly allocated) structure. On |
317 | 195 | * failure this will be NULL. | 196 | * failure this will be NULL. |
318 | 196 | */ | 197 | */ |
321 | 197 | gearman_connection_st *gearman_connection_create_args(gearman_universal_st &universal, | 198 | gearman_connection_st *gearman_connection_create(gearman_universal_st &universal, |
322 | 198 | const char *host, in_port_t port); | 199 | const char *host, const in_port_t&); |
323 | 199 | 200 | ||
326 | 200 | gearman_connection_st *gearman_connection_create_args(gearman_universal_st &universal, | 201 | gearman_connection_st *gearman_connection_create(gearman_universal_st &universal, |
327 | 201 | const char* host, const char* service); | 202 | const char* host, const char* service); |
328 | 202 | 203 | ||
329 | === modified file 'libgearman/worker.cc' | |||
330 | --- libgearman/worker.cc 2013-06-11 01:05:38 +0000 | |||
331 | +++ libgearman/worker.cc 2013-06-25 23:50:39 +0000 | |||
332 | @@ -445,7 +445,7 @@ | |||
333 | 445 | { | 445 | { |
334 | 446 | if (worker and worker->impl()) | 446 | if (worker and worker->impl()) |
335 | 447 | { | 447 | { |
337 | 448 | if (gearman_connection_create_args(worker->impl()->universal, host, port) == NULL) | 448 | if (gearman_connection_create(worker->impl()->universal, host, port) == NULL) |
338 | 449 | { | 449 | { |
339 | 450 | return gearman_universal_error_code(worker->impl()->universal); | 450 | return gearman_universal_error_code(worker->impl()->universal); |
340 | 451 | } | 451 | } |
341 | 452 | 452 | ||
342 | === modified file 'tests/libgearman-1.0/internals.cc' | |||
343 | --- tests/libgearman-1.0/internals.cc 2013-06-11 06:48:11 +0000 | |||
344 | +++ tests/libgearman-1.0/internals.cc 2013-06-25 23:50:39 +0000 | |||
345 | @@ -94,23 +94,23 @@ | |||
346 | 94 | gearman_universal_clone(destination, gear); | 94 | gearman_universal_clone(destination, gear); |
347 | 95 | 95 | ||
348 | 96 | { // Test all of the flags | 96 | { // Test all of the flags |
350 | 97 | test_truth(destination.options.non_blocking == gear.options.non_blocking); | 97 | ASSERT_EQ(destination.options.non_blocking, gear.options.non_blocking); |
351 | 98 | } | 98 | } |
367 | 99 | test_truth(destination._namespace == gear._namespace); | 99 | ASSERT_EQ(destination._namespace, gear._namespace); |
368 | 100 | test_truth(destination.verbose == gear.verbose); | 100 | ASSERT_EQ(destination.verbose, gear.verbose); |
369 | 101 | test_truth(destination.con_count == gear.con_count); | 101 | ASSERT_EQ(destination.con_count, gear.con_count); |
370 | 102 | test_truth(destination.packet_count == gear.packet_count); | 102 | ASSERT_EQ(destination.packet_count, gear.packet_count); |
371 | 103 | test_truth(destination.pfds_size == gear.pfds_size); | 103 | ASSERT_EQ(destination.pfds_size, gear.pfds_size); |
372 | 104 | test_truth(destination._error.last_errno == gear._error.last_errno); | 104 | ASSERT_EQ(destination._error.last_errno, gear._error.last_errno); |
373 | 105 | test_truth(destination.timeout == gear.timeout); | 105 | ASSERT_EQ(destination.timeout, gear.timeout); |
374 | 106 | test_truth(destination.con_list == gear.con_list); | 106 | ASSERT_EQ(destination.con_list, gear.con_list); |
375 | 107 | test_truth(destination.packet_list == gear.packet_list); | 107 | ASSERT_EQ(destination.packet_list, gear.packet_list); |
376 | 108 | test_truth(destination.pfds == gear.pfds); | 108 | ASSERT_EQ(destination.pfds, gear.pfds); |
377 | 109 | test_truth(destination.log_fn == gear.log_fn); | 109 | ASSERT_EQ(destination.log_fn, gear.log_fn); |
378 | 110 | test_truth(destination.log_context == gear.log_context); | 110 | ASSERT_EQ(destination.log_context, gear.log_context); |
379 | 111 | test_truth(destination.allocator.malloc == gear.allocator.malloc); | 111 | ASSERT_EQ(destination.allocator.malloc, gear.allocator.malloc); |
380 | 112 | test_truth(destination.allocator.context == gear.allocator.context); | 112 | ASSERT_EQ(destination.allocator.context, gear.allocator.context); |
381 | 113 | test_truth(destination.allocator.free == gear.allocator.free); | 113 | ASSERT_EQ(destination.allocator.free, gear.allocator.free); |
382 | 114 | 114 | ||
383 | 115 | gearman_universal_free(gear); | 115 | gearman_universal_free(gear); |
384 | 116 | } | 116 | } |
385 | @@ -171,7 +171,7 @@ | |||
386 | 171 | gearman_universal_st universal(options); | 171 | gearman_universal_st universal(options); |
387 | 172 | 172 | ||
388 | 173 | { // Initial Allocated, no changes | 173 | { // Initial Allocated, no changes |
390 | 174 | test_truth(universal.options.non_blocking); | 174 | ASSERT_TRUE(universal.options.non_blocking); |
391 | 175 | } | 175 | } |
392 | 176 | gearman_universal_free(universal); | 176 | gearman_universal_free(universal); |
393 | 177 | 177 | ||
394 | @@ -200,11 +200,11 @@ | |||
395 | 200 | ASSERT_FALSE(universal._namespace); | 200 | ASSERT_FALSE(universal._namespace); |
396 | 201 | 201 | ||
397 | 202 | gearman_universal_set_namespace(universal, gearman_literal_param("my_dog")); | 202 | gearman_universal_set_namespace(universal, gearman_literal_param("my_dog")); |
399 | 203 | test_truth(universal._namespace); | 203 | ASSERT_TRUE(universal._namespace); |
400 | 204 | 204 | ||
401 | 205 | gearman_universal_st clone; | 205 | gearman_universal_st clone; |
402 | 206 | gearman_universal_clone(clone, universal); | 206 | gearman_universal_clone(clone, universal); |
404 | 207 | test_truth(clone._namespace); | 207 | ASSERT_TRUE(clone._namespace); |
405 | 208 | 208 | ||
406 | 209 | gearman_universal_free(universal); | 209 | gearman_universal_free(universal); |
407 | 210 | gearman_universal_free(clone); | 210 | gearman_universal_free(clone); |
408 | @@ -218,7 +218,7 @@ | |||
409 | 218 | gearman_universal_st universal(options); | 218 | gearman_universal_st universal(options); |
410 | 219 | 219 | ||
411 | 220 | { // Initial Allocated, no changes | 220 | { // Initial Allocated, no changes |
413 | 221 | test_truth(universal.options.non_blocking); | 221 | ASSERT_TRUE(universal.options.non_blocking); |
414 | 222 | } | 222 | } |
415 | 223 | 223 | ||
416 | 224 | ASSERT_TRUE(gearman_universal_is_non_blocking(universal)); | 224 | ASSERT_TRUE(gearman_universal_is_non_blocking(universal)); |
417 | @@ -259,8 +259,8 @@ | |||
418 | 259 | { | 259 | { |
419 | 260 | gearman_universal_st universal; | 260 | gearman_universal_st universal; |
420 | 261 | 261 | ||
423 | 262 | gearman_connection_st *connection_ptr= gearman_connection_create(universal, NULL); | 262 | gearman_connection_st *connection_ptr= gearman_connection_create(universal, NULL, (const char*)(GEARMAN_DEFAULT_TCP_PORT_STRING)); |
424 | 263 | test_truth(connection_ptr); | 263 | ASSERT_TRUE(connection_ptr); |
425 | 264 | 264 | ||
426 | 265 | ASSERT_FALSE(connection_ptr->options.ready); | 265 | ASSERT_FALSE(connection_ptr->options.ready); |
427 | 266 | ASSERT_FALSE(connection_ptr->options.packet_in_use); | 266 | ASSERT_FALSE(connection_ptr->options.packet_in_use); |
428 | @@ -274,8 +274,8 @@ | |||
429 | 274 | { | 274 | { |
430 | 275 | gearman_universal_st universal; | 275 | gearman_universal_st universal; |
431 | 276 | 276 | ||
434 | 277 | gearman_connection_st *connection_ptr= gearman_connection_create(universal, NULL); | 277 | gearman_connection_st *connection_ptr= gearman_connection_create(universal, NULL, (const char*)(GEARMAN_DEFAULT_TCP_PORT_STRING)); |
435 | 278 | test_truth(connection_ptr); | 278 | ASSERT_TRUE(connection_ptr); |
436 | 279 | 279 | ||
437 | 280 | ASSERT_FALSE(connection_ptr->options.ready); | 280 | ASSERT_FALSE(connection_ptr->options.ready); |
438 | 281 | ASSERT_FALSE(connection_ptr->options.packet_in_use); | 281 | ASSERT_FALSE(connection_ptr->options.packet_in_use); |
439 | @@ -305,7 +305,7 @@ | |||
440 | 305 | ASSERT_FALSE(packet.options.complete); | 305 | ASSERT_FALSE(packet.options.complete); |
441 | 306 | ASSERT_FALSE(packet.options.free_data); | 306 | ASSERT_FALSE(packet.options.free_data); |
442 | 307 | 307 | ||
444 | 308 | test_truth(packet_ptr == &packet); | 308 | ASSERT_EQ(packet_ptr, &packet); |
445 | 309 | 309 | ||
446 | 310 | gearman_packet_free(packet_ptr); | 310 | gearman_packet_free(packet_ptr); |
447 | 311 | ASSERT_FALSE(packet.options.is_allocated); | 311 | ASSERT_FALSE(packet.options.is_allocated); |
448 | @@ -326,13 +326,13 @@ | |||
449 | 326 | 326 | ||
450 | 327 | gearman_packet_st packet; | 327 | gearman_packet_st packet; |
451 | 328 | 328 | ||
453 | 329 | test_truth(gearman_packet_create(universal, packet)); | 329 | ASSERT_TRUE(gearman_packet_create(universal, packet)); |
454 | 330 | 330 | ||
455 | 331 | gearman_packet_give_data(packet, data, data_size); | 331 | gearman_packet_give_data(packet, data, data_size); |
456 | 332 | 332 | ||
458 | 333 | test_truth(packet.data == data); | 333 | ASSERT_EQ(packet.data, data); |
459 | 334 | ASSERT_EQ(packet.data_size, data_size); | 334 | ASSERT_EQ(packet.data_size, data_size); |
461 | 335 | test_truth(packet.options.free_data); | 335 | ASSERT_TRUE(packet.options.free_data); |
462 | 336 | 336 | ||
463 | 337 | gearman_packet_free(&packet); | 337 | gearman_packet_free(&packet); |
464 | 338 | gearman_universal_free(universal); | 338 | gearman_universal_free(universal); |
465 | @@ -354,13 +354,13 @@ | |||
466 | 354 | gearman_packet_st packet; | 354 | gearman_packet_st packet; |
467 | 355 | 355 | ||
468 | 356 | gearman_packet_st *packet_ptr= gearman_packet_create(universal, packet); | 356 | gearman_packet_st *packet_ptr= gearman_packet_create(universal, packet); |
470 | 357 | test_truth(packet_ptr); | 357 | ASSERT_TRUE(packet_ptr); |
471 | 358 | 358 | ||
472 | 359 | gearman_packet_give_data(packet, data, data_size); | 359 | gearman_packet_give_data(packet, data, data_size); |
473 | 360 | 360 | ||
475 | 361 | test_truth(packet_ptr->data == data); | 361 | ASSERT_EQ(packet_ptr->data, data); |
476 | 362 | ASSERT_EQ(data_size, packet_ptr->data_size); | 362 | ASSERT_EQ(data_size, packet_ptr->data_size); |
478 | 363 | test_truth(packet_ptr->options.free_data); | 363 | ASSERT_TRUE(packet_ptr->options.free_data); |
479 | 364 | 364 | ||
480 | 365 | size_t mine_size; | 365 | size_t mine_size; |
481 | 366 | char *mine= (char *)gearman_packet_take_data(packet, &mine_size); | 366 | char *mine= (char *)gearman_packet_take_data(packet, &mine_size); |
482 | 367 | 367 | ||
483 | === modified file 'tests/libgearman-1.0/regression.cc' | |||
484 | --- tests/libgearman-1.0/regression.cc 2013-01-03 02:58:19 +0000 | |||
485 | +++ tests/libgearman-1.0/regression.cc 2013-06-25 23:50:39 +0000 | |||
486 | @@ -126,9 +126,7 @@ | |||
487 | 126 | { | 126 | { |
488 | 127 | gearman_packet_st packet; | 127 | gearman_packet_st packet; |
489 | 128 | gearman_connection_st *con_ptr; | 128 | gearman_connection_st *con_ptr; |
493 | 129 | test_truth(con_ptr= gearman_connection_create(universal, NULL)); | 129 | test_truth(con_ptr= gearman_connection_create(universal, NULL, default_port())); |
491 | 130 | |||
492 | 131 | con_ptr->set_host(NULL, default_port()); | ||
494 | 132 | 130 | ||
495 | 133 | args[0]= "testUnregisterFunction"; | 131 | args[0]= "testUnregisterFunction"; |
496 | 134 | args_size[0]= strlen("testUnregisterFunction"); | 132 | args_size[0]= strlen("testUnregisterFunction"); |
497 | @@ -159,9 +157,7 @@ | |||
498 | 159 | 157 | ||
499 | 160 | delete con_ptr; | 158 | delete con_ptr; |
500 | 161 | 159 | ||
504 | 162 | test_truth(con_ptr= gearman_connection_create(universal, NULL)); | 160 | test_truth(con_ptr= gearman_connection_create(universal, NULL, default_port())); |
502 | 163 | |||
503 | 164 | con_ptr->set_host(NULL, default_port()); | ||
505 | 165 | 161 | ||
506 | 166 | args[0]= "testUnregisterFunction"; | 162 | args[0]= "testUnregisterFunction"; |
507 | 167 | args_size[0]= strlen("testUnregisterFunction"); | 163 | args_size[0]= strlen("testUnregisterFunction"); |
508 | 168 | 164 | ||
509 | === modified file 'tests/libgearman-1.0/worker_test.cc' | |||
510 | --- tests/libgearman-1.0/worker_test.cc 2013-06-15 01:53:12 +0000 | |||
511 | +++ tests/libgearman-1.0/worker_test.cc 2013-06-25 23:50:39 +0000 | |||
512 | @@ -888,9 +888,7 @@ | |||
513 | 888 | gearman_universal_st universal; | 888 | gearman_universal_st universal; |
514 | 889 | 889 | ||
515 | 890 | gearman_connection_st *connection1; | 890 | gearman_connection_st *connection1; |
519 | 891 | test_truth(connection1= gearman_connection_create(universal, NULL)); | 891 | test_truth(connection1= gearman_connection_create(universal, NULL, default_port())); |
517 | 892 | |||
518 | 893 | connection1->set_host(NULL, libtest::default_port()); | ||
520 | 894 | 892 | ||
521 | 895 | gearman_packet_st packet; | 893 | gearman_packet_st packet; |
522 | 896 | args[0]= "abandoned_worker"; | 894 | args[0]= "abandoned_worker"; |
523 | @@ -921,9 +919,7 @@ | |||
524 | 921 | gearman_packet_free(&packet); | 919 | gearman_packet_free(&packet); |
525 | 922 | 920 | ||
526 | 923 | gearman_connection_st *connection2; | 921 | gearman_connection_st *connection2; |
530 | 924 | test_truth(connection2= gearman_connection_create(universal, NULL)); | 922 | test_truth(connection2= gearman_connection_create(universal, NULL, default_port())); |
528 | 925 | |||
529 | 926 | connection2->set_host(NULL, libtest::default_port()); | ||
531 | 927 | 923 | ||
532 | 928 | args[0]= "abandoned_worker"; | 924 | args[0]= "abandoned_worker"; |
533 | 929 | args_size[0]= strlen("abandoned_worker"); | 925 | args_size[0]= strlen("abandoned_worker"); |