Compare commits

...
1 Commits
Author SHA1 Message Date
Witold Kręcicki fdd0565d1c TEST: use send instead of sendto for network tasks 2019-02-20 09:57:49 +01:00
+11 -13
View File
@@ -2737,10 +2737,9 @@ send_recvdone_event(isc__socket_t *sock, isc_socketevent_t **dev) {
} }
if (((*dev)->attributes & ISC_SOCKEVENTATTR_ATTACHED) != 0) { if (((*dev)->attributes & ISC_SOCKEVENTATTR_ATTACHED) != 0) {
isc_task_sendtoanddetach(&task, (isc_event_t **)dev, isc_task_sendanddetach(&task, (isc_event_t **)dev);
sock->threadid);
} else { } else {
isc_task_sendto(task, (isc_event_t **)dev, sock->threadid); isc_task_send(task, (isc_event_t **)dev);
} }
} }
@@ -2762,10 +2761,9 @@ send_senddone_event(isc__socket_t *sock, isc_socketevent_t **dev) {
ISC_LIST_DEQUEUE(sock->send_list, *dev, ev_link); ISC_LIST_DEQUEUE(sock->send_list, *dev, ev_link);
if (((*dev)->attributes & ISC_SOCKEVENTATTR_ATTACHED) != 0) { if (((*dev)->attributes & ISC_SOCKEVENTATTR_ATTACHED) != 0) {
isc_task_sendtoanddetach(&task, (isc_event_t **)dev, isc_task_sendanddetach(&task, (isc_event_t **)dev);
sock->threadid);
} else { } else {
isc_task_sendto(task, (isc_event_t **)dev, sock->threadid); isc_task_send(task, (isc_event_t **)dev);
} }
} }
@@ -2787,7 +2785,7 @@ send_connectdone_event(isc__socket_t *sock, isc_socket_connev_t **dev) {
ISC_LIST_DEQUEUE(sock->connect_list, *dev, ev_link); ISC_LIST_DEQUEUE(sock->connect_list, *dev, ev_link);
} }
isc_task_sendtoanddetach(&task, (isc_event_t **)dev, sock->threadid); isc_task_sendanddetach(&task, (isc_event_t **)dev);
} }
/* /*
@@ -3033,7 +3031,7 @@ internal_accept(isc__socket_t *sock) {
task = dev->ev_sender; task = dev->ev_sender;
dev->ev_sender = sock; dev->ev_sender = sock;
isc_task_sendtoanddetach(&task, ISC_EVENT_PTR(&dev), sock->threadid); isc_task_sendanddetach(&task, ISC_EVENT_PTR(&dev));
return; return;
soft_error: soft_error:
@@ -4765,7 +4763,7 @@ isc_socket_connect(isc_socket_t *sock0, const isc_sockaddr_t *addr,
if (sock->connected) { if (sock->connected) {
INSIST(isc_sockaddr_equal(&sock->peer_address, addr)); INSIST(isc_sockaddr_equal(&sock->peer_address, addr));
dev->result = ISC_R_SUCCESS; dev->result = ISC_R_SUCCESS;
isc_task_sendto(task, ISC_EVENT_PTR(&dev), sock->threadid); isc_task_send(task, ISC_EVENT_PTR(&dev));
UNLOCK(&sock->lock); UNLOCK(&sock->lock);
@@ -4829,7 +4827,7 @@ isc_socket_connect(isc_socket_t *sock0, const isc_sockaddr_t *addr,
err_exit: err_exit:
sock->connected = 0; sock->connected = 0;
isc_task_sendto(task, ISC_EVENT_PTR(&dev), sock->threadid); isc_task_send(task, ISC_EVENT_PTR(&dev));
UNLOCK(&sock->lock); UNLOCK(&sock->lock);
inc_stats(sock->manager->stats, inc_stats(sock->manager->stats,
@@ -4845,7 +4843,7 @@ isc_socket_connect(isc_socket_t *sock0, const isc_sockaddr_t *addr,
sock->connected = 1; sock->connected = 1;
sock->bound = 1; sock->bound = 1;
dev->result = ISC_R_SUCCESS; dev->result = ISC_R_SUCCESS;
isc_task_sendto(task, ISC_EVENT_PTR(&dev), sock->threadid); isc_task_send(task, ISC_EVENT_PTR(&dev));
UNLOCK(&sock->lock); UNLOCK(&sock->lock);
@@ -5131,8 +5129,8 @@ isc_socket_cancel(isc_socket_t *sock0, isc_task_t *task, unsigned int how) {
dev->result = ISC_R_CANCELED; dev->result = ISC_R_CANCELED;
dev->ev_sender = sock; dev->ev_sender = sock;
isc_task_sendtoanddetach(&current_task, isc_task_sendanddetach(&current_task,
ISC_EVENT_PTR(&dev), sock->threadid); ISC_EVENT_PTR(&dev));
} }
dev = next; dev = next;