Commit 2368c639 authored by Scott Vokes's avatar Scott Vokes
Browse files

Rename 'sender' to 'send' & eliminate comment referencs to distinct sender. 

The sender thread's functionality has been integrated into the client thread.
parent d5c268ff

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ LIB_OBJS = \ 
	$(OUT_DIR)/bus.o \

	$(OUT_DIR)/bus_ssl.o \

	$(OUT_DIR)/listener.o \

	$(OUT_DIR)/sender.o \

	$(OUT_DIR)/send.o \

	$(OUT_DIR)/util.o \

	$(OUT_DIR)/yacht.o \

src/lib/bus/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ BUS_OBJS = \ 
	bus.o \

	bus_ssl.o \

	listener.o \

	sender.o \

	send.o \

	util.o \

	yacht.o \

src/lib/bus/bus.c

+4 −4
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#include <sys/resource.h>



#include "bus.h"

#include "sender.h"

#include "send.h"

#include "listener.h"

#include "threadpool.h"

#include "bus_internal_types.h"
@@ -298,7 +298,7 @@ bool bus_send_request(struct bus *b, bus_user_msg *msg) 


    BUS_LOG_SNPRINTF(b, 3-0, LOG_SENDING_REQUEST, b->udata, 64,

        "Sending request <fd:%d, seq_id:%lld>", msg->fd, (long long)msg->seq_id);

    bool res = sender_do_blocking_send(b, box);

    bool res = send_do_blocking_send(b, box);

    BUS_LOG_SNPRINTF(b, 3, LOG_SENDING_REQUEST, b->udata, 64,

        "...request sent, result %d", res);
@@ -404,13 +404,13 @@ const char *bus_log_event_str(log_event_t event) { 
}



bool bus_register_socket(struct bus *b, bus_socket_t type, int fd, void *udata) {

    /* Register a socket internally with a sender and listener. */

    /* Register a socket internally with the listener. */

    int l_id = listener_id_of_socket(b, fd);



    BUS_LOG_SNPRINTF(b, 2, LOG_SOCKET_REGISTERED, b->udata, 64,

        "registering socket %d", fd);



    /* Spread sockets throughout the different sender & listener processes. */

    /* Spread sockets throughout the different listener threads. */

    struct listener *l = b->listeners[l_id];

    

    int pipes[2];

src/lib/bus/bus.h

+1 −2
Original line number Diff line number Diff line
@@ -65,9 +65,8 @@ bool bus_release_socket(struct bus *b, int fd, void **socket_udata_out); 
 * has resolved. */

bool bus_shutdown(struct bus *b);



/* For a given file descriptor, get the listener / sender ID to use.

/* For a given file descriptor, get the listener ID to use.

 * This will level sockets between multiple threads. */

struct sender *bus_get_sender_for_socket(struct bus *b, int fd);

struct listener *bus_get_listener_for_socket(struct bus *b, int fd);



/* Schedule a task in the bus's threadpool. */

src/lib/bus/bus_internal_types.h

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#include "bus.h"

#include "yacht.h"



/* Struct for a message that will be passed from sender to listener to

/* Struct for a message that will be passed from client to listener to

 * threadpool, proceeding directly to the threadpool if there is an error

 * along the way. This must only have a single owner at a time. */

typedef struct boxed_msg {
@@ -115,7 +115,7 @@ typedef struct { 
    const bus_socket_t type;

    void *udata;                /* user connection data */



    /* Shared, cleaned up by sender */

    /* Shared, cleaned up by client */

    SSL *ssl;                   /* SSL handle. Must be valid or BUS_NO_SSL. */



    /* Set by client thread */