From 04fc82f7ad31aafa062ec4578f74b62003507d6e Mon Sep 17 00:00:00 2001 From: Azat Khuzhin Date: Fri, 11 Mar 2016 01:27:52 +0300 Subject: [PATCH] test: use EVUTIL_SHUT_WR --- test/regress.c | 18 +++++++----------- test/regress_et.c | 6 +----- test/regress_http.c | 14 +++----------- test/test-closed.c | 7 ++----- test/test-eof.c | 7 ++----- util-internal.h | 2 +- 6 files changed, 16 insertions(+), 38 deletions(-) diff --git a/test/regress.c b/test/regress.c index b12c66df..550c7a5a 100644 --- a/test/regress.c +++ b/test/regress.c @@ -93,10 +93,6 @@ static struct timeval tcalled; #define TEST1 "this is a test" -#ifndef SHUT_WR -#define SHUT_WR 1 -#endif - #ifdef _WIN32 #define write(fd,buf,len) send((fd),(buf),(int)(len),0) #define read(fd,buf,len) recv((fd),(buf),(int)(len),0) @@ -200,7 +196,7 @@ multiple_write_cb(evutil_socket_t fd, short event, void *arg) woff += len; if (woff >= (int)sizeof(wbuf)) { - shutdown(fd, SHUT_WR); + shutdown(fd, EVUTIL_SHUT_WR); if (usepersist) event_del(ev); return; @@ -280,7 +276,7 @@ combined_write_cb(evutil_socket_t fd, short event, void *arg) if (len == -1) fprintf(stderr, "%s: write\n", __func__); if (len <= 0) { - shutdown(fd, SHUT_WR); + shutdown(fd, EVUTIL_SHUT_WR); return; } @@ -310,7 +306,7 @@ test_simpleread(void) tt_fail_perror("write"); } - shutdown(pair[0], SHUT_WR); + shutdown(pair[0], EVUTIL_SHUT_WR); event_set(&ev, pair[1], EV_READ, simple_read_cb, &ev); if (event_add(&ev, NULL) == -1) @@ -355,7 +351,7 @@ test_simpleread_multiple(void) tt_fail_perror("write"); } - shutdown(pair[0], SHUT_WR); + shutdown(pair[0], EVUTIL_SHUT_WR); event_set(&one, pair[1], EV_READ, simpleread_multiple_cb, NULL); if (event_add(&one, NULL) == -1) @@ -918,7 +914,7 @@ test_fork(void) fprintf(stderr, "%s: write\n", __func__); } - shutdown(pair[0], SHUT_WR); + shutdown(pair[0], EVUTIL_SHUT_WR); evsignal_set(&usr_ev, SIGUSR1, fork_signal_cb, &usr_ev); evsignal_add(&usr_ev, NULL); @@ -1886,7 +1882,7 @@ test_event_base_new(void *ptr) tt_abort_printf(("initial write fell short (%d of %d bytes)", len, towrite)); - if (shutdown(data->pair[0], SHUT_WR)) + if (shutdown(data->pair[0], EVUTIL_SHUT_WR)) tt_abort_perror("initial write shutdown"); base = event_base_new(); @@ -2715,7 +2711,7 @@ test_event_once(void *ptr) tt_fail_perror("write"); } - shutdown(data->pair[1], SHUT_WR); + shutdown(data->pair[1], EVUTIL_SHUT_WR); event_base_dispatch(data->base); diff --git a/test/regress_et.c b/test/regress_et.c index 229a78e2..f75c59b3 100644 --- a/test/regress_et.c +++ b/test/regress_et.c @@ -67,10 +67,6 @@ read_cb(evutil_socket_t fd, short event, void *arg) event_del(arg); } -#ifndef SHUT_WR -#define SHUT_WR 1 -#endif - #ifdef _WIN32 #define LOCAL_SOCKETPAIR_AF AF_INET #else @@ -105,7 +101,7 @@ test_edgetriggered(void *et) called = was_et = 0; tt_int_op(send(pair[0], test, (int)strlen(test)+1, 0), >, 0); - shutdown(pair[0], SHUT_WR); + shutdown(pair[0], EVUTIL_SHUT_WR); /* Initalize the event library */ base = event_base_new(); diff --git a/test/regress_http.c b/test/regress_http.c index 7d07a0b1..f11f8cae 100644 --- a/test/regress_http.c +++ b/test/regress_http.c @@ -595,14 +595,6 @@ http_badreq_errorcb(struct bufferevent *bev, short what, void *arg) /* ignore */ } -#ifndef SHUT_WR -#ifdef _WIN32 -#define SHUT_WR SD_SEND -#else -#define SHUT_WR 1 -#endif -#endif - static void http_badreq_readcb(struct bufferevent *bev, void *arg) { @@ -639,7 +631,7 @@ http_badreq_readcb(struct bufferevent *bev, void *arg) evbuffer_drain(bufferevent_get_input(bev), evbuffer_get_length(bufferevent_get_input(bev))); } - shutdown(bufferevent_getfd(bev), SHUT_WR); + shutdown(bufferevent_getfd(bev), EVUTIL_SHUT_WR); } static void @@ -683,7 +675,7 @@ http_bad_request_test(void *arg) bufferevent_write(bev, http_request, strlen(http_request)); - shutdown(fd, SHUT_WR); + shutdown(fd, EVUTIL_SHUT_WR); timerclear(&tv); tv.tv_usec = 10000; event_base_once(data->base, -1, EV_TIMEOUT, http_badreq_successcb, bev, &tv); @@ -2846,7 +2838,7 @@ http_incomplete_writecb(struct bufferevent *bev, void *arg) if (arg != NULL) { evutil_socket_t fd = *(evutil_socket_t *)arg; /* terminate the write side to simulate EOF */ - shutdown(fd, SHUT_WR); + shutdown(fd, EVUTIL_SHUT_WR); } if (evbuffer_get_length(bufferevent_get_output(bev)) == 0) { /* enable reading of the reply */ diff --git a/test/test-closed.c b/test/test-closed.c index 5b04f354..47a56fa8 100644 --- a/test/test-closed.c +++ b/test/test-closed.c @@ -24,6 +24,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "../util-internal.h" #include "event2/event-config.h" #ifdef _WIN32 @@ -71,10 +72,6 @@ closed_cb(evutil_socket_t fd, short event, void *arg) exit(1); } -#ifndef SHUT_WR -#define SHUT_WR 1 -#endif - int main(int argc, char **argv) { @@ -103,7 +100,7 @@ main(int argc, char **argv) /* Send some data on socket 0 and immediately close it */ if (send(pair[0], test, (int)strlen(test)+1, 0) < 0) return (1); - shutdown(pair[0], SHUT_WR); + shutdown(pair[0], EVUTIL_SHUT_WR); /* Dispatch */ ev = event_new(base, pair[1], EV_CLOSED | EV_TIMEOUT, closed_cb, event_self_cbarg()); diff --git a/test/test-eof.c b/test/test-eof.c index a9ca5343..61169b14 100644 --- a/test/test-eof.c +++ b/test/test-eof.c @@ -24,6 +24,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "../util-internal.h" #include "event2/event-config.h" #ifdef _WIN32 @@ -81,10 +82,6 @@ read_cb(evutil_socket_t fd, short event, void *arg) called++; } -#ifndef SHUT_WR -#define SHUT_WR 1 -#endif - int main(int argc, char **argv) { @@ -107,7 +104,7 @@ main(int argc, char **argv) if (send(pair[0], test, (int)strlen(test)+1, 0) < 0) return (1); - shutdown(pair[0], SHUT_WR); + shutdown(pair[0], EVUTIL_SHUT_WR); /* Initalize the event library */ event_init(); diff --git a/util-internal.h b/util-internal.h index 06aa9729..ff6c5e48 100644 --- a/util-internal.h +++ b/util-internal.h @@ -134,7 +134,7 @@ extern "C" { #ifdef SHUT_WR #define EVUTIL_SHUT_WR SHUT_WR #else -#define EVUTIL_SHUT_WR 1 +#define EVUTIL_SHUT_WR 1 /* SD_SEND */ #endif #ifdef SHUT_BOTH #define EVUTIL_SHUT_BOTH SHUT_BOTH -- 2.50.1