#endif /* __x86_x64__ */
libmemif_main_t libmemif_main;
-int memif_epfd;
-int poll_cancel_fd = -1;
static char memif_buf[MAX_ERRBUF_LEN];
/* MEMIF_ERR_CONNREFUSED */
"Connection refused",
/* MEMIF_ERR_ACCES */
- "Permission to resoure denied.",
+ "Permission to resource denied.",
/* MEMIF_ERR_NO_FILE */
"Socket file does not exist",
/* MEMIF_ERR_FILE_LIMIT */
/* MEMIF_ERR_INVAL_ARG */
"Invalid argument.",
/* MEMIF_ERR_NOCONN */
- "Memif connection handle does not point to existing conenction",
+ "Memif connection handle does not point to existing connection",
/* MEMIF_ERR_CONN */
"Memif connection handle points to existing connection",
/* MEMIF_ERR_CB_FDUPDATE */
/* MEMIF_ERR_NOBUF */
"Not enough memif buffers. There are unreceived data in shared memory.",
/* MEMIF_ERR_NOBUF_DET */
- "Not enough space for memif details in suplied buffer. String data might be malformed.",
+ "Not enough space for memif details in supplied buffer. String data might be malformed.",
/* MEMIF_ERR_INT_WRITE */
"Send interrupt error.",
/* MEMIF_ERR_MFMSG */
/* MEMIF_ERR_ID */
"Unmatched interface id.",
/* MEMIF_ERR_ACCSLAVE */
- "Slave cannot accept connection reqest.",
+ "Slave cannot accept connection request.",
/* MEMIF_ERR_ALRCONN */
"Interface is already connected.",
/* MEMIF_ERR_MODE */
return MEMIF_ERR_SYSCALL;
}
+/* Always valid */
+libmemif_main_t *
+get_libmemif_main (memif_socket_t * ms)
+{
+ if (ms != NULL && ms->lm != NULL)
+ return ms->lm;
+ return &libmemif_main;
+}
+
static int
-memif_add_epoll_fd (int fd, uint32_t events)
+memif_add_epoll_fd (libmemif_main_t * lm, int fd, uint32_t events)
{
if (fd < 0)
{
memset (&evt, 0, sizeof (evt));
evt.events = events;
evt.data.fd = fd;
- if (epoll_ctl (memif_epfd, EPOLL_CTL_ADD, fd, &evt) < 0)
+ if (epoll_ctl (lm->epfd, EPOLL_CTL_ADD, fd, &evt) < 0)
{
DBG ("epoll_ctl: %s fd %d", strerror (errno), fd);
return -1;
}
static int
-memif_mod_epoll_fd (int fd, uint32_t events)
+memif_mod_epoll_fd (libmemif_main_t * lm, int fd, uint32_t events)
{
if (fd < 0)
{
memset (&evt, 0, sizeof (evt));
evt.events = events;
evt.data.fd = fd;
- if (epoll_ctl (memif_epfd, EPOLL_CTL_MOD, fd, &evt) < 0)
+ if (epoll_ctl (lm->epfd, EPOLL_CTL_MOD, fd, &evt) < 0)
{
DBG ("epoll_ctl: %s fd %d", strerror (errno), fd);
return -1;
}
- DBG ("fd %d moddified on epoll", fd);
+ DBG ("fd %d modified on epoll", fd);
return 0;
}
static int
-memif_del_epoll_fd (int fd)
+memif_del_epoll_fd (libmemif_main_t * lm, int fd)
{
if (fd < 0)
{
}
struct epoll_event evt;
memset (&evt, 0, sizeof (evt));
- if (epoll_ctl (memif_epfd, EPOLL_CTL_DEL, fd, &evt) < 0)
+ if (epoll_ctl (lm->epfd, EPOLL_CTL_DEL, fd, &evt) < 0)
{
DBG ("epoll_ctl: %s fd %d", strerror (errno), fd);
return -1;
int
memif_control_fd_update (int fd, uint8_t events, void *private_ctx)
{
+ libmemif_main_t *lm;
+
+ lm = (private_ctx == NULL) ? &libmemif_main : (libmemif_main_t *) private_ctx;
+
if (events & MEMIF_FD_EVENT_DEL)
- return memif_del_epoll_fd (fd);
+ return memif_del_epoll_fd (lm, fd);
uint32_t evt = 0;
if (events & MEMIF_FD_EVENT_READ)
evt |= EPOLLOUT;
if (events & MEMIF_FD_EVENT_MOD)
- return memif_mod_epoll_fd (fd, evt);
+ return memif_mod_epoll_fd (lm, fd, evt);
- return memif_add_epoll_fd (fd, evt);
+ return memif_add_epoll_fd (lm, fd, evt);
}
int
-add_list_elt (memif_list_elt_t * e, memif_list_elt_t ** list, uint16_t * len)
+add_list_elt (libmemif_main_t * lm, memif_list_elt_t * e,
+ memif_list_elt_t ** list, uint16_t * len)
{
- libmemif_main_t *lm = &libmemif_main;
memif_list_elt_t *tmp;
int i;
}
static void
-memif_control_fd_update_register (memif_control_fd_update_t * cb)
+memif_control_fd_update_register (libmemif_main_t * lm,
+ memif_control_fd_update_t * cb)
{
- libmemif_main_t *lm = &libmemif_main;
lm->control_fd_update = cb;
}
}
static void
-memif_alloc_register (memif_alloc_t * ma)
+memif_alloc_register (libmemif_main_t * lm, memif_alloc_t * ma)
{
- libmemif_main_t *lm = &libmemif_main;
lm->alloc = ma;
}
static void
-memif_realloc_register (memif_realloc_t * mr)
+memif_realloc_register (libmemif_main_t * lm, memif_realloc_t * mr)
{
- libmemif_main_t *lm = &libmemif_main;
lm->realloc = mr;
}
static void
-memif_free_register (memif_free_t * mf)
+memif_free_register (libmemif_main_t * lm, memif_free_t * mf)
{
- libmemif_main_t *lm = &libmemif_main;
lm->free = mf;
}
return err;
}
+int
+memif_per_thread_set_connection_request_timer (memif_per_thread_main_handle_t
+ pt_main,
+ struct itimerspec timer)
+{
+ libmemif_main_t *lm = (libmemif_main_t *) pt_main;
+ int err = MEMIF_ERR_SUCCESS;
+
+ lm->arm = timer;
+
+ /* overwrite timer, if already armed */
+ if (lm->disconn_slaves != 0)
+ {
+ if (timerfd_settime (lm->timerfd, 0, &lm->arm, NULL) < 0)
+ {
+ err = memif_syscall_error_handler (errno);
+ }
+ }
+ return err;
+}
+
int
memif_init (memif_control_fd_update_t * on_control_fd_update, char *app_name,
memif_alloc_t * memif_alloc, memif_realloc_t * memif_realloc,
libmemif_main_t *lm = &libmemif_main;
memset (lm, 0, sizeof (libmemif_main_t));
+ /* register custom memory management */
if (memif_alloc != NULL)
{
- memif_alloc_register (memif_alloc);
+ memif_alloc_register (lm, memif_alloc);
}
else
- memif_alloc_register (malloc);
+ memif_alloc_register (lm, malloc);
if (memif_realloc != NULL)
{
- memif_realloc_register (memif_realloc);
+ memif_realloc_register (lm, memif_realloc);
}
else
- memif_realloc_register (realloc);
+ memif_realloc_register (lm, realloc);
if (memif_free != NULL)
- memif_free_register (memif_free);
+ memif_free_register (lm, memif_free);
else
- memif_free_register (free);
+ memif_free_register (lm, free);
if (app_name != NULL)
{
strlen (MEMIF_DEFAULT_APP_NAME));
}
+ lm->poll_cancel_fd = -1;
/* register control fd update callback */
if (on_control_fd_update != NULL)
- memif_control_fd_update_register (on_control_fd_update);
+ memif_control_fd_update_register (lm, on_control_fd_update);
else
{
- memif_epfd = epoll_create (1);
- memif_control_fd_update_register (memif_control_fd_update);
- if ((poll_cancel_fd = eventfd (0, EFD_NONBLOCK)) < 0)
+ lm->epfd = epoll_create (1);
+ memif_control_fd_update_register (lm, memif_control_fd_update);
+ if ((lm->poll_cancel_fd = eventfd (0, EFD_NONBLOCK)) < 0)
{
err = errno;
DBG ("eventfd: %s", strerror (err));
return memif_syscall_error_handler (err);
}
- lm->control_fd_update (poll_cancel_fd, MEMIF_FD_EVENT_READ, NULL);
+ lm->control_fd_update (lm->poll_cancel_fd, MEMIF_FD_EVENT_READ, lm->private_ctx);
DBG ("libmemif event polling initialized");
}
lm->arm.it_interval.tv_sec = MEMIF_DEFAULT_RECONNECT_PERIOD_SEC;
lm->arm.it_interval.tv_nsec = MEMIF_DEFAULT_RECONNECT_PERIOD_NSEC;
- if (lm->control_fd_update (lm->timerfd, MEMIF_FD_EVENT_READ, NULL) < 0)
+ if (lm->control_fd_update (lm->timerfd, MEMIF_FD_EVENT_READ, lm->private_ctx) < 0)
{
DBG ("callback type memif_control_fd_update_t error!");
err = MEMIF_ERR_CB_FDUPDATE;
goto error;
}
+ /* Create default socket */
+ err = memif_create_socket ((memif_socket_handle_t *) &
+ lm->default_socket,
+ MEMIF_DEFAULT_SOCKET_PATH, NULL);
+ if (err != MEMIF_ERR_SUCCESS)
+ goto error;
+
return err;
error:
return err;
}
+int
+memif_per_thread_init (memif_per_thread_main_handle_t * pt_main,
+ void *private_ctx,
+ memif_control_fd_update_t * on_control_fd_update,
+ char *app_name, memif_alloc_t * memif_alloc,
+ memif_realloc_t * memif_realloc,
+ memif_free_t * memif_free)
+{
+ memif_err_t err = MEMIF_ERR_SUCCESS;
+ int i;
+ libmemif_main_t *lm;
+
+ /* Allocate unique libmemif main */
+ if (memif_alloc != NULL)
+ lm = memif_alloc (sizeof (libmemif_main_t));
+ else
+ lm = malloc (sizeof (libmemif_main_t));
+
+ if (lm == NULL)
+ return MEMIF_ERR_NOMEM;
+
+ memset (lm, 0, sizeof (libmemif_main_t));
+
+ /* register custom memory management */
+ if (memif_alloc != NULL)
+ {
+ memif_alloc_register (lm, memif_alloc);
+ }
+ else
+ memif_alloc_register (lm, malloc);
+
+ if (memif_realloc != NULL)
+ {
+ memif_realloc_register (lm, memif_realloc);
+ }
+ else
+ memif_realloc_register (lm, realloc);
+
+ if (memif_free != NULL)
+ memif_free_register (lm, memif_free);
+ else
+ memif_free_register (lm, free);
+
+ lm->private_ctx = private_ctx;
+
+ /* set app name */
+ if (app_name != NULL)
+ {
+ uint8_t len = (strlen (app_name) > MEMIF_NAME_LEN)
+ ? strlen (app_name) : MEMIF_NAME_LEN;
+ strncpy ((char *) lm->app_name, app_name, len);
+ }
+ else
+ {
+ strncpy ((char *) lm->app_name, MEMIF_DEFAULT_APP_NAME,
+ strlen (MEMIF_DEFAULT_APP_NAME));
+ }
+
+ lm->poll_cancel_fd = -1;
+ /* register control fd update callback */
+ if (on_control_fd_update != NULL)
+ memif_control_fd_update_register (lm, on_control_fd_update);
+ else
+ {
+ /* private_ctx only used internally by memif_control_fd_update
+ * pointer to this libmemif main
+ */
+ lm->private_ctx = lm;
+ lm->epfd = epoll_create (1);
+ memif_control_fd_update_register (lm, memif_control_fd_update);
+ if ((lm->poll_cancel_fd = eventfd (0, EFD_NONBLOCK)) < 0)
+ {
+ err = errno;
+ DBG ("eventfd: %s", strerror (err));
+ return memif_syscall_error_handler (err);
+ }
+ lm->control_fd_update (lm->poll_cancel_fd, MEMIF_FD_EVENT_READ,
+ lm->private_ctx);
+ DBG ("libmemif event polling initialized");
+ }
+
+ /* Initialize lists */
+ lm->control_list_len = 2;
+ lm->interrupt_list_len = 2;
+ lm->socket_list_len = 1;
+ lm->pending_list_len = 1;
+
+ lm->control_list =
+ lm->alloc (sizeof (memif_list_elt_t) * lm->control_list_len);
+ if (lm->control_list == NULL)
+ {
+ err = MEMIF_ERR_NOMEM;
+ goto error;
+ }
+ lm->interrupt_list =
+ lm->alloc (sizeof (memif_list_elt_t) * lm->interrupt_list_len);
+ if (lm->interrupt_list == NULL)
+ {
+ err = MEMIF_ERR_NOMEM;
+ goto error;
+ }
+ lm->socket_list =
+ lm->alloc (sizeof (memif_list_elt_t) * lm->socket_list_len);
+ if (lm->socket_list == NULL)
+ {
+ err = MEMIF_ERR_NOMEM;
+ goto error;
+ }
+ lm->pending_list =
+ lm->alloc (sizeof (memif_list_elt_t) * lm->pending_list_len);
+ if (lm->pending_list == NULL)
+ {
+ err = MEMIF_ERR_NOMEM;
+ goto error;
+ }
+
+ for (i = 0; i < lm->control_list_len; i++)
+ {
+ lm->control_list[i].key = -1;
+ lm->control_list[i].data_struct = NULL;
+ }
+ for (i = 0; i < lm->interrupt_list_len; i++)
+ {
+ lm->interrupt_list[i].key = -1;
+ lm->interrupt_list[i].data_struct = NULL;
+ }
+ for (i = 0; i < lm->socket_list_len; i++)
+ {
+ lm->socket_list[i].key = -1;
+ lm->socket_list[i].data_struct = NULL;
+ }
+ for (i = 0; i < lm->pending_list_len; i++)
+ {
+ lm->pending_list[i].key = -1;
+ lm->pending_list[i].data_struct = NULL;
+ }
+
+ /* Initialize autoconnect */
+ lm->disconn_slaves = 0;
+
+ lm->timerfd = timerfd_create (CLOCK_REALTIME, TFD_NONBLOCK);
+ if (lm->timerfd < 0)
+ {
+ err = memif_syscall_error_handler (errno);
+ goto error;
+ }
+
+ lm->arm.it_value.tv_sec = MEMIF_DEFAULT_RECONNECT_PERIOD_SEC;
+ lm->arm.it_value.tv_nsec = MEMIF_DEFAULT_RECONNECT_PERIOD_NSEC;
+ lm->arm.it_interval.tv_sec = MEMIF_DEFAULT_RECONNECT_PERIOD_SEC;
+ lm->arm.it_interval.tv_nsec = MEMIF_DEFAULT_RECONNECT_PERIOD_NSEC;
+
+ if (lm->control_fd_update (lm->timerfd, MEMIF_FD_EVENT_READ,
+ lm->private_ctx) < 0)
+ {
+ DBG ("callback type memif_control_fd_update_t error!");
+ err = MEMIF_ERR_CB_FDUPDATE;
+ goto error;
+ }
+
+ *pt_main = lm;
+
+ return err;
+
+error:
+ *pt_main = lm;
+ memif_per_thread_cleanup (pt_main);
+ return err;
+}
+
static inline memif_ring_t *
memif_get_ring (memif_connection_t * conn, memif_ring_type_t type,
uint16_t ring_num)
static int
memif_socket_start_listening (memif_socket_t * ms)
{
- libmemif_main_t *lm = &libmemif_main;
+ libmemif_main_t *lm = get_libmemif_main (ms);
memif_list_elt_t elt;
struct stat file_stat;
struct sockaddr_un un = { 0 };
/* add socket to libmemif main */
elt.key = ms->fd;
elt.data_struct = ms;
- add_list_elt (&elt, &lm->socket_list, &lm->socket_list_len);
- lm->control_fd_update (ms->fd, MEMIF_FD_EVENT_READ, ms->private_ctx);
+ add_list_elt (lm, &elt, &lm->socket_list, &lm->socket_list_len);
+ /* if lm->private_ctx == lm event polling is done by libmemif */
+ lm->control_fd_update (ms->fd, MEMIF_FD_EVENT_READ, lm->private_ctx);
ms->type = MEMIF_SOCKET_TYPE_LISTENER;
return err;
}
+int
+memif_per_thread_create_socket (memif_per_thread_main_handle_t pt_main,
+ memif_socket_handle_t * sock,
+ const char *filename, void *private_ctx)
+{
+ libmemif_main_t *lm = (libmemif_main_t *) pt_main;
+ memif_socket_t *ms = (memif_socket_t *) * sock;
+ int i, err = MEMIF_ERR_SUCCESS;
+
+ if (lm == NULL)
+ return MEMIF_ERR_INVAL_ARG;
+
+ for (i = 0; i < lm->socket_list_len; i++)
+ {
+ if ((ms = (memif_socket_t *) lm->socket_list[i].data_struct) != NULL)
+ {
+ if (strncmp ((char *) ms->filename, filename,
+ strlen ((char *) ms->filename)) == 0)
+ return MEMIF_ERR_INVAL_ARG;
+ }
+ }
+
+ /* allocate memif_socket_t */
+ ms = NULL;
+ ms = lm->alloc (sizeof (memif_socket_t));
+ if (ms == NULL)
+ {
+ err = MEMIF_ERR_NOMEM;
+ goto error;
+ }
+ memset (ms, 0, sizeof (memif_socket_t));
+ ms->lm = lm;
+ /* set filename */
+ ms->filename = lm->alloc (strlen (filename) + sizeof (char));
+ if (ms->filename == NULL)
+ {
+ err = MEMIF_ERR_NOMEM;
+ goto error;
+ }
+ memset (ms->filename, 0, strlen (filename) + sizeof (char));
+ strncpy ((char *) ms->filename, filename, strlen (filename));
+
+ ms->type = MEMIF_SOCKET_TYPE_NONE;
+
+ ms->interface_list_len = 1;
+ ms->interface_list =
+ lm->alloc (sizeof (memif_list_elt_t) * ms->interface_list_len);
+ if (ms->interface_list == NULL)
+ {
+ err = MEMIF_ERR_NOMEM;
+ goto error;
+ }
+ ms->interface_list[0].key = -1;
+ ms->interface_list[0].data_struct = NULL;
+
+ *sock = ms;
+
+ return err;
+
+error:
+ if (ms != NULL)
+ {
+ if (ms->filename != NULL)
+ {
+ lm->free (ms->filename);
+ ms->filename = NULL;
+ }
+ if (ms->fd > 0)
+ {
+ close (ms->fd);
+ ms->fd = -1;
+ }
+ if (ms->interface_list != NULL)
+ {
+ lm->free (ms->interface_list);
+ ms->interface_list = NULL;
+ ms->interface_list_len = 0;
+ }
+ lm->free (ms);
+ *sock = ms = NULL;
+ }
+ return err;
+}
+
int
memif_create (memif_conn_handle_t * c, memif_conn_args_t * args,
memif_connection_update_t * on_connect,
memif_connection_update_t * on_disconnect,
memif_interrupt_t * on_interrupt, void *private_ctx)
{
- libmemif_main_t *lm = &libmemif_main;
+ libmemif_main_t *lm = get_libmemif_main (args->socket);
int err, index = 0;
memif_list_elt_t elt;
memif_connection_t *conn = (memif_connection_t *) * c;
DBG ("This handle already points to existing memif.");
return MEMIF_ERR_CONN;
}
+
conn = (memif_connection_t *) lm->alloc (sizeof (memif_connection_t));
if (conn == NULL)
{
if (args->socket != NULL)
conn->args.socket = args->socket;
+ else if (lm->default_socket != NULL)
+ conn->args.socket = lm->default_socket;
else
{
- if (lm->default_socket == NULL)
- {
- err =
- memif_create_socket ((memif_socket_handle_t *) &
- lm->default_socket,
- MEMIF_DEFAULT_SOCKET_PATH, NULL);
- if (err != MEMIF_ERR_SUCCESS)
- goto error;
- }
- conn->args.socket = lm->default_socket;
+ err = MEMIF_ERR_INVAL_ARG;
+ goto error;
}
+
ms = (memif_socket_t *) conn->args.socket;
if ((conn->args.is_master && ms->type == MEMIF_SOCKET_TYPE_CLIENT) ||
elt.key = conn->args.interface_id;
elt.data_struct = conn;
- add_list_elt (&elt, &ms->interface_list, &ms->interface_list_len);
+ add_list_elt (lm, &elt, &ms->interface_list, &ms->interface_list_len);
ms->use_count++;
if (conn->args.is_master)
{
if (ms->type == MEMIF_SOCKET_TYPE_NONE)
- err = memif_socket_start_listening (ms);
- if (err != MEMIF_ERR_SUCCESS)
- goto error;
+ {
+ err = memif_socket_start_listening (ms);
+ if (err != MEMIF_ERR_SUCCESS)
+ goto error;
+ }
}
else
{
elt.key = -1;
elt.data_struct = conn;
if ((index =
- add_list_elt (&elt, &lm->control_list, &lm->control_list_len)) < 0)
+ add_list_elt (lm, &elt, &lm->control_list,
+ &lm->control_list_len)) < 0)
{
err = MEMIF_ERR_NOMEM;
goto error;
conn->index = index;
- /* try connectiong to master */
+ /* try connecting to master */
err = memif_request_connection (conn);
if ((err != MEMIF_ERR_SUCCESS) && (lm->disconn_slaves == 0))
{
goto error;
}
}
- lm->disconn_slaves++;
+ lm->disconn_slaves++;
}
*c = conn;
int
memif_request_connection (memif_conn_handle_t c)
{
- libmemif_main_t *lm = &libmemif_main;
memif_connection_t *conn = (memif_connection_t *) c;
+ libmemif_main_t *lm;
memif_socket_t *ms;
int err = MEMIF_ERR_SUCCESS;
int sockfd = -1;
return MEMIF_ERR_NOCONN;
ms = (memif_socket_t *) conn->args.socket;
+ lm = get_libmemif_main (ms);
+
if (conn->args.is_master || ms->type == MEMIF_SOCKET_TYPE_LISTENER)
return MEMIF_ERR_INVAL_ARG;
conn->error_fn = memif_conn_fd_error;
lm->control_list[conn->index].key = conn->fd;
-
lm->control_fd_update (sockfd,
MEMIF_FD_EVENT_READ |
- MEMIF_FD_EVENT_WRITE, conn->private_ctx);
+ MEMIF_FD_EVENT_WRITE, lm->private_ctx);
lm->disconn_slaves--;
if (lm->disconn_slaves == 0)
{
if (timerfd_settime (lm->timerfd, 0, &lm->disarm, NULL) < 0)
{
- err = memif_syscall_error_handler (errno);
- return err;
+ err = memif_syscall_error_handler (errno);
+ return err;
+ }
+ }
+ }
+ else
+ {
+ err = memif_syscall_error_handler (errno);
+ strcpy ((char *) conn->remote_disconnect_string, memif_strerror (err));
+ goto error;
+ }
+
+ ms->type = MEMIF_SOCKET_TYPE_CLIENT;
+
+ return err;
+
+error:
+ if (sockfd > 0)
+ close (sockfd);
+ sockfd = -1;
+ return err;
+}
+
+int
+memif_control_fd_handler (int fd, uint8_t events)
+{
+ int i, err = MEMIF_ERR_SUCCESS; /* 0 */
+ uint16_t num;
+ memif_list_elt_t *e = NULL;
+ memif_connection_t *conn;
+ libmemif_main_t *lm = &libmemif_main;
+ if (fd == lm->timerfd)
+ {
+ uint64_t b;
+ ssize_t size;
+ size = read (fd, &b, sizeof (b));
+
+ if (size == -1)
+ goto error;
+
+ for (i = 0; i < lm->control_list_len; i++)
+ {
+ if ((lm->control_list[i].key < 0)
+ && (lm->control_list[i].data_struct != NULL))
+ {
+ conn = lm->control_list[i].data_struct;
+ if (conn->args.is_master)
+ continue;
+ err = memif_request_connection (conn);
+ if (err != MEMIF_ERR_SUCCESS)
+ DBG ("memif_request_connection: %s", memif_strerror (err));
}
}
}
else
{
- err = memif_syscall_error_handler (errno);
- strcpy ((char *) conn->remote_disconnect_string,
- memif_strerror (err));
- goto error;
- }
+ get_list_elt (&e, lm->interrupt_list, lm->interrupt_list_len, fd);
+ if (e != NULL)
+ {
+ if (((memif_connection_t *) e->data_struct)->on_interrupt != NULL)
+ {
+ num =
+ (((memif_connection_t *) e->data_struct)->
+ args.is_master) ? ((memif_connection_t *) e->
+ data_struct)->run_args.
+ num_s2m_rings : ((memif_connection_t *) e->data_struct)->
+ run_args.num_m2s_rings;
+ for (i = 0; i < num; i++)
+ {
+ if (((memif_connection_t *) e->data_struct)->
+ rx_queues[i].int_fd == fd)
+ {
+ ((memif_connection_t *) e->data_struct)->
+ on_interrupt ((void *) e->data_struct,
+ ((memif_connection_t *) e->
+ data_struct)->private_ctx, i);
+ return MEMIF_ERR_SUCCESS;
+ }
+ }
+ }
+ return MEMIF_ERR_SUCCESS;
+ }
+ get_list_elt (&e, lm->socket_list, lm->socket_list_len, fd);
+ if (e != NULL
+ && ((memif_socket_t *) e->data_struct)->type ==
+ MEMIF_SOCKET_TYPE_LISTENER)
+ {
+ err =
+ memif_conn_fd_accept_ready ((memif_socket_t *) e->data_struct);
+ return err;
+ }
- ms->type = MEMIF_SOCKET_TYPE_CLIENT;
+ get_list_elt (&e, lm->pending_list, lm->pending_list_len, fd);
+ if (e != NULL)
+ {
+ err = memif_read_ready (lm, fd);
+ return err;
+ }
- return err;
+ get_list_elt (&e, lm->control_list, lm->control_list_len, fd);
+ if (e != NULL)
+ {
+ if (events & MEMIF_FD_EVENT_READ)
+ {
+ err =
+ ((memif_connection_t *) e->data_struct)->
+ read_fn (e->data_struct);
+ if (err != MEMIF_ERR_SUCCESS)
+ return err;
+ }
+ if (events & MEMIF_FD_EVENT_WRITE)
+ {
+ err =
+ ((memif_connection_t *) e->data_struct)->
+ write_fn (e->data_struct);
+ if (err != MEMIF_ERR_SUCCESS)
+ return err;
+ }
+ if (events & MEMIF_FD_EVENT_ERROR)
+ {
+ err =
+ ((memif_connection_t *) e->data_struct)->
+ error_fn (e->data_struct);
+ if (err != MEMIF_ERR_SUCCESS)
+ return err;
+ }
+ }
+ }
+
+ return MEMIF_ERR_SUCCESS; /* 0 */
error:
- if (sockfd > 0)
- close (sockfd);
- sockfd = -1;
return err;
}
int
-memif_control_fd_handler (int fd, uint8_t events)
+memif_per_thread_control_fd_handler (memif_per_thread_main_handle_t pt_main,
+ int fd, uint8_t events)
{
int i, err = MEMIF_ERR_SUCCESS; /* 0 */
uint16_t num;
memif_list_elt_t *e = NULL;
memif_connection_t *conn;
- libmemif_main_t *lm = &libmemif_main;
+ libmemif_main_t *lm = (libmemif_main_t *) pt_main;
+
if (fd == lm->timerfd)
{
uint64_t b;
get_list_elt (&e, lm->pending_list, lm->pending_list_len, fd);
if (e != NULL)
{
- err = memif_read_ready (fd);
+ err = memif_read_ready (lm, fd);
return err;
}
int
memif_poll_event (int timeout)
{
+ libmemif_main_t *lm = &libmemif_main;
+ struct epoll_event evt;
+ int en = 0, err = MEMIF_ERR_SUCCESS; /* 0 */
+ uint32_t events = 0;
+ uint64_t counter = 0;
+ ssize_t r = 0;
+ memset (&evt, 0, sizeof (evt));
+ evt.events = EPOLLIN | EPOLLOUT;
+ sigset_t sigset;
+ sigemptyset (&sigset);
+ en = epoll_pwait (lm->epfd, &evt, 1, timeout, &sigset);
+ if (en < 0)
+ {
+ err = errno;
+ DBG ("epoll_pwait: %s", strerror (err));
+ return memif_syscall_error_handler (err);
+ }
+ if (en > 0)
+ {
+ if (evt.data.fd == lm->poll_cancel_fd)
+ {
+ r = read (evt.data.fd, &counter, sizeof (counter));
+ if (r == -1)
+ return MEMIF_ERR_DISCONNECTED;
+
+ return MEMIF_ERR_POLL_CANCEL;
+ }
+ if (evt.events & EPOLLIN)
+ events |= MEMIF_FD_EVENT_READ;
+ if (evt.events & EPOLLOUT)
+ events |= MEMIF_FD_EVENT_WRITE;
+ if (evt.events & EPOLLERR)
+ events |= MEMIF_FD_EVENT_ERROR;
+ err = memif_control_fd_handler (evt.data.fd, events);
+ return err;
+ }
+ return 0;
+}
+
+int
+memif_per_thread_poll_event (memif_per_thread_main_handle_t pt_main,
+ int timeout)
+{
+ libmemif_main_t *lm = (libmemif_main_t *) pt_main;
struct epoll_event evt;
int en = 0, err = MEMIF_ERR_SUCCESS; /* 0 */
uint32_t events = 0;
evt.events = EPOLLIN | EPOLLOUT;
sigset_t sigset;
sigemptyset (&sigset);
- en = epoll_pwait (memif_epfd, &evt, 1, timeout, &sigset);
+ en = epoll_pwait (lm->epfd, &evt, 1, timeout, &sigset);
if (en < 0)
{
err = errno;
}
if (en > 0)
{
- if (evt.data.fd == poll_cancel_fd)
+ if (evt.data.fd == lm->poll_cancel_fd)
{
r = read (evt.data.fd, &counter, sizeof (counter));
if (r == -1)
int
memif_cancel_poll_event ()
{
+ libmemif_main_t *lm = &libmemif_main;
+ uint64_t counter = 1;
+ ssize_t w = 0;
+
+ if (lm->poll_cancel_fd == -1)
+ return 0;
+ w = write (lm->poll_cancel_fd, &counter, sizeof (counter));
+ if (w < sizeof (counter))
+ return MEMIF_ERR_INT_WRITE;
+
+ return 0;
+}
+
+int
+memif_per_thread_cancel_poll_event (memif_per_thread_main_handle_t pt_main)
+{
+ libmemif_main_t *lm = (libmemif_main_t *) pt_main;
uint64_t counter = 1;
ssize_t w = 0;
- if (poll_cancel_fd == -1)
+ if (lm == NULL)
+ return MEMIF_ERR_INVAL_ARG;
+
+ if (lm->poll_cancel_fd == -1)
return 0;
- w = write (poll_cancel_fd, &counter, sizeof (counter));
+ w = write (lm->poll_cancel_fd, &counter, sizeof (counter));
if (w < sizeof (counter))
return MEMIF_ERR_INT_WRITE;
int
memif_disconnect_internal (memif_connection_t * c)
{
+ int err = MEMIF_ERR_SUCCESS, i; /* 0 */
+ memif_queue_t *mq;
+ libmemif_main_t *lm;
+ memif_list_elt_t *e;
+
if (c == NULL)
{
DBG ("no connection");
return MEMIF_ERR_NOCONN;
}
- uint16_t num;
- int err = MEMIF_ERR_SUCCESS, i; /* 0 */
- memif_queue_t *mq;
- libmemif_main_t *lm = &libmemif_main;
- memif_list_elt_t *e;
+
+ lm = get_libmemif_main (c->args.socket);
c->on_disconnect ((void *) c, c->private_ctx);
if (c->fd > 0)
{
memif_msg_send_disconnect (c->fd, (uint8_t *) "interface deleted", 0);
- lm->control_fd_update (c->fd, MEMIF_FD_EVENT_DEL, c->private_ctx);
+ lm->control_fd_update (c->fd, MEMIF_FD_EVENT_DEL, lm->private_ctx);
close (c->fd);
}
get_list_elt (&e, lm->control_list, lm->control_list_len, c->fd);
if (c->tx_queues != NULL)
{
- num =
- (c->args.is_master) ? c->run_args.num_m2s_rings : c->
- run_args.num_s2m_rings;
- for (i = 0; i < num; i++)
+ for (i = 0; i < c->tx_queues_num; i++)
{
mq = &c->tx_queues[i];
if (mq != NULL)
lm->free (c->tx_queues);
c->tx_queues = NULL;
}
+ c->tx_queues_num = 0;
if (c->rx_queues != NULL)
{
- num =
- (c->args.is_master) ? c->run_args.num_s2m_rings : c->
- run_args.num_m2s_rings;
- for (i = 0; i < num; i++)
+ for (i = 0; i < c->rx_queues_num; i++)
{
mq = &c->rx_queues[i];
if (mq != NULL)
{
if (c->on_interrupt != NULL)
lm->control_fd_update (mq->int_fd, MEMIF_FD_EVENT_DEL,
- c->private_ctx);
+ lm->private_ctx);
close (mq->int_fd);
}
free_list_elt (lm->interrupt_list, lm->interrupt_list_len,
lm->free (c->rx_queues);
c->rx_queues = NULL;
}
+ c->rx_queues_num = 0;
for (i = 0; i < c->regions_num; i++)
{
return err;
}
+const char *
+memif_get_socket_filename (memif_socket_handle_t sock)
+{
+ memif_socket_t *ms = (memif_socket_t *) sock;
+
+ if (ms == NULL)
+ return NULL;
+
+ return (char *) ms->filename;
+}
+
int
memif_delete_socket (memif_socket_handle_t * sock)
{
memif_socket_t *ms = (memif_socket_t *) * sock;
- libmemif_main_t *lm = &libmemif_main;
+ libmemif_main_t *lm;
/* check if socket is in use */
- if (ms == NULL || ms->type != MEMIF_SOCKET_TYPE_NONE)
+ if (ms == NULL || ms->use_count > 0)
return MEMIF_ERR_INVAL_ARG;
+ lm = get_libmemif_main (ms);
+
lm->free (ms->interface_list);
ms->interface_list = NULL;
lm->free (ms->filename);
memif_delete (memif_conn_handle_t * conn)
{
memif_connection_t *c = (memif_connection_t *) * conn;
- libmemif_main_t *lm = &libmemif_main;
+ libmemif_main_t *lm;
memif_socket_t *ms = NULL;
int err = MEMIF_ERR_SUCCESS;
return err;
}
+ lm = get_libmemif_main (c->args.socket);
+
free_list_elt_ctx (lm->control_list, lm->control_list_len, c);
ms = (memif_socket_t *) c->args.socket;
/* stop listening on this socket */
if (ms->type == MEMIF_SOCKET_TYPE_LISTENER)
{
- lm->control_fd_update (ms->fd, MEMIF_FD_EVENT_DEL, ms->private_ctx);
+ lm->control_fd_update (ms->fd, MEMIF_FD_EVENT_DEL, lm->private_ctx);
free_list_elt (lm->socket_list, lm->socket_list_len, ms->fd);
close (ms->fd);
ms->fd = -1;
int
memif_connect1 (memif_connection_t * c)
{
- libmemif_main_t *lm = &libmemif_main;
+ libmemif_main_t *lm;
memif_region_t *mr;
memif_queue_t *mq;
int i;
+ if (c == NULL)
+ return MEMIF_ERR_INVAL_ARG;
+
+ lm = get_libmemif_main (c->args.socket);
+
for (i = 0; i < c->regions_num; i++)
{
mr = &c->regions[i];
DBG ("wrong cookie on rx ring %u", i);
return MEMIF_ERR_COOKIE;
}
- mq->ring->head = mq->ring->tail = mq->last_head = mq->alloc_bufs =
- 0;
+ mq->ring->head = mq->ring->tail = mq->last_head = mq->next_buf = 0;
}
}
DBG ("wrong cookie on tx ring %u", i);
return MEMIF_ERR_COOKIE;
}
- mq->ring->head = mq->ring->tail = mq->last_head = mq->alloc_bufs =
- 0;
+ mq->ring->head = mq->ring->tail = mq->last_head = mq->next_buf = 0;
}
}
lm->control_fd_update (c->fd, MEMIF_FD_EVENT_READ | MEMIF_FD_EVENT_MOD,
- c->private_ctx);
+ lm->private_ctx);
return 0;
}
return memif_syscall_error_handler (errno);
e.key = mq[x].int_fd;
e.data_struct = conn;
- add_list_elt (&e, &lm->interrupt_list, &lm->interrupt_list_len);
+ add_list_elt (lm, &e, &lm->interrupt_list, &lm->interrupt_list_len);
mq[x].ring = memif_get_ring (conn, MEMIF_RING_S2M, x);
DBG ("RING: %p I: %d", mq[x].ring, x);
mq[x].offset =
(void *) mq[x].ring - (void *) conn->regions[mq->region].addr;
mq[x].last_head = mq[x].last_tail = 0;
- mq[x].alloc_bufs = 0;
+ mq[x].next_buf = 0;
}
conn->tx_queues = mq;
+ conn->tx_queues_num = conn->run_args.num_s2m_rings;
mq =
(memif_queue_t *) lm->alloc (sizeof (memif_queue_t) *
return memif_syscall_error_handler (errno);
e.key = mq[x].int_fd;
e.data_struct = conn;
- add_list_elt (&e, &lm->interrupt_list, &lm->interrupt_list_len);
+ add_list_elt (lm, &e, &lm->interrupt_list, &lm->interrupt_list_len);
mq[x].ring = memif_get_ring (conn, MEMIF_RING_M2S, x);
DBG ("RING: %p I: %d", mq[x].ring, x);
mq[x].offset =
(void *) mq[x].ring - (void *) conn->regions[mq->region].addr;
mq[x].last_head = mq[x].last_tail = 0;
- mq[x].alloc_bufs = 0;
+ mq[x].next_buf = 0;
}
conn->rx_queues = mq;
+ conn->rx_queues_num = conn->run_args.num_m2s_rings;
return MEMIF_ERR_SUCCESS;
}
memif_init_regions_and_queues (memif_connection_t * conn)
{
memif_region_t *r;
- libmemif_main_t *lm = &libmemif_main;
+ libmemif_main_t *lm;
+
+ if (conn == NULL)
+ return MEMIF_ERR_INVAL_ARG;
+
+ lm = get_libmemif_main (conn->args.socket);
/* region 0. rings */
memif_add_region (lm, conn, /* has_buffers */ 0);
return 0;
}
+static void
+memif_buffer_enq_at_idx_internal (memif_queue_t *from_q, memif_queue_t *to_q,
+ memif_buffer_t *buf, uint16_t slot)
+{
+ uint16_t from_mask = (1 << from_q->log2_ring_size) - 1;
+ uint16_t to_mask = (1 << to_q->log2_ring_size) - 1;
+ memif_desc_t *from_d, *to_d, tmp_d;
+
+ /* Get the descriptors */
+ from_d = &from_q->ring->desc[buf->desc_index & from_mask];
+ to_d = &to_q->ring->desc[slot & to_mask];
+
+ /* Swap descriptors */
+ tmp_d = *from_d;
+ *from_d = *to_d;
+ *to_d = tmp_d;
+
+ /* Update descriptor index and queue for clients buffer */
+ buf->desc_index = slot;
+ buf->queue = to_q;
+}
+
+int
+memif_buffer_requeue (memif_conn_handle_t conn, memif_buffer_t *buf_a,
+ memif_buffer_t *buf_b)
+{
+ memif_connection_t *c = (memif_connection_t *) conn;
+ if (EXPECT_FALSE (c == NULL))
+ return MEMIF_ERR_NOCONN;
+ if (EXPECT_FALSE (c->args.is_master))
+ return MEMIF_ERR_INVAL_ARG;
+ if ((buf_a == NULL) || (buf_b == NULL))
+ return MEMIF_ERR_INVAL_ARG;
+
+ int err;
+ /* store buf_a information */
+ uint16_t index_a = buf_a->desc_index;
+ memif_queue_t *mq_a = buf_a->queue;
+
+ /* swap buffers, buf_a was updated with new desc_index and queue */
+ memif_buffer_enq_at_idx_internal ((memif_queue_t *) buf_a->queue,
+ (memif_queue_t *) buf_b->queue, buf_a,
+ buf_b->desc_index);
+
+ /* update buf_b desc_index and queue */
+ buf_b->desc_index = index_a;
+ buf_b->queue = mq_a;
+
+ return MEMIF_ERR_SUCCESS;
+}
+
int
memif_buffer_enq_tx (memif_conn_handle_t conn, uint16_t qid,
memif_buffer_t * bufs, uint16_t count,
return MEMIF_ERR_NOCONN;
if (EXPECT_FALSE (c->fd < 0))
return MEMIF_ERR_DISCONNECTED;
- uint8_t num =
- (c->args.is_master) ? c->run_args.num_m2s_rings : c->
- run_args.num_s2m_rings;
- if (EXPECT_FALSE (qid >= num))
+ if (EXPECT_FALSE (qid >= c->tx_queues_num))
return MEMIF_ERR_QID;
if (EXPECT_FALSE (!count_out))
return MEMIF_ERR_INVAL_ARG;
memif_buffer_t *b0;
uint16_t mask = (1 << mq->log2_ring_size) - 1;
uint16_t ring_size;
- uint16_t slot, ns;
+ uint16_t ns;
+ memif_queue_t *bmq;
int err = MEMIF_ERR_SUCCESS; /* 0 */
*count_out = 0;
ring_size = (1 << mq->log2_ring_size);
- slot = (c->args.is_master) ? ring->tail : ring->head;
- slot += mq->alloc_bufs;
/* can only be called by slave */
- ns = ring_size - (ring->head + mq->alloc_bufs) + ring->tail;
+ ns = ring_size - mq->next_buf + ring->tail;
b0 = bufs;
while (count && ns)
{
- if (EXPECT_FALSE ((b0->flags & MEMIF_BUFFER_FLAG_RX) == 0))
- {
- /* not a valid buffer */
- count--;
- continue;
- }
- b0->flags &= ~MEMIF_BUFFER_FLAG_RX;
-
- ((memif_ring_t *) b0->ring)->desc[b0->desc_index & mask].offset = ring->desc[slot & mask].offset; /* put free buffer on rx ring */
-
- ring->desc[slot & mask].offset =
- (uint32_t) (b0->data -
- c->regions[ring->desc[slot & mask].region].addr);
- ring->desc[slot & mask].flags &= ~MEMIF_DESC_FLAG_NEXT;
- ring->desc[slot & mask].flags |=
- (b0->flags & MEMIF_BUFFER_FLAG_NEXT) ? MEMIF_DESC_FLAG_NEXT : 0;
+ /* Swaps the descriptors, updates next_buf pointer and updates client
+ * memif buffer */
- b0->desc_index = slot;
-
- mq->alloc_bufs++;
- slot++;
+ memif_buffer_enq_at_idx_internal ((memif_queue_t *) b0->queue, mq, b0,
+ mq->next_buf);
+ mq->next_buf++; /* mark the buffer as allocated */
count--;
ns--;
b0++;
*count_out += 1;
}
- DBG ("allocated: %u/%u bufs. Total %u allocated bufs", *count_out, count,
- mq->alloc_bufs);
+ DBG ("allocated: %u/%u bufs. Next buffer pointer %d", *count_out, count,
+ mq->next_buf);
if (count)
{
if (EXPECT_FALSE (!count_out))
return MEMIF_ERR_INVAL_ARG;
- libmemif_main_t *lm = &libmemif_main;
+ libmemif_main_t *lm = get_libmemif_main (c->args.socket);
memif_queue_t *mq = &c->tx_queues[qid];
memif_ring_t *ring = mq->ring;
memif_buffer_t *b0;
uint16_t mask = (1 << mq->log2_ring_size) - 1;
uint32_t offset_mask = c->run_args.buffer_size - 1;
uint16_t ring_size;
- uint16_t slot, ns;
+ uint16_t ns;
int err = MEMIF_ERR_SUCCESS; /* 0 */
uint16_t dst_left, src_left;
uint16_t saved_count;
+ uint16_t saved_next_buf;
memif_buffer_t *saved_b;
*count_out = 0;
ring_size = (1 << mq->log2_ring_size);
- slot = (c->args.is_master) ? ring->tail : ring->head;
- slot += mq->alloc_bufs;
if (c->args.is_master)
- ns = ring->head - (ring->tail + mq->alloc_bufs);
+ ns = ring->head - mq->next_buf;
else
- ns = ring_size - (ring->head + mq->alloc_bufs) + ring->tail;
+ ns = ring_size - mq->next_buf + ring->tail;
while (count && ns)
{
saved_b = b0;
saved_count = count;
+ saved_next_buf = mq->next_buf;
- b0->desc_index = slot;
- ring->desc[slot & mask].flags = 0;
+ b0->desc_index = mq->next_buf;
+ ring->desc[mq->next_buf & mask].flags = 0;
/* slave can produce buffer with original length */
- dst_left = (c->args.is_master) ? ring->desc[slot & mask].length :
- c->run_args.buffer_size;
+ dst_left = (c->args.is_master) ? ring->desc[mq->next_buf & mask].length :
+ c->run_args.buffer_size;
src_left = size;
while (src_left)
{
if (count && ns)
{
- slot++;
*count_out += 1;
- mq->alloc_bufs++;
+ mq->next_buf++;
ns--;
ring->desc[b0->desc_index & mask].flags |=
b0->flags |= MEMIF_BUFFER_FLAG_NEXT;
b0 = (bufs + *count_out);
- b0->desc_index = slot;
- dst_left =
- (c->args.is_master) ? ring->desc[slot & mask].
- length : c->run_args.buffer_size;
- ring->desc[slot & mask].flags = 0;
+ b0->desc_index = mq->next_buf;
+ dst_left = (c->args.is_master) ?
+ ring->desc[mq->next_buf & mask].length :
+ c->run_args.buffer_size;
+ ring->desc[mq->next_buf & mask].flags = 0;
}
else
{
memset (saved_b, 0, sizeof (memif_buffer_t)
* (saved_count - count + 1));
*count_out -= saved_count - count;
- mq->alloc_bufs = saved_count - count;
+ mq->next_buf = saved_next_buf;
goto no_ns;
}
}
/* slave resets buffer offset */
if (c->args.is_master == 0)
{
- memif_desc_t *d = &ring->desc[slot & mask];
+ memif_desc_t *d = &ring->desc[mq->next_buf & mask];
if (lm->get_external_buffer_offset)
d->offset = lm->get_external_buffer_offset (c->private_ctx);
else
d->offset = d->offset - (d->offset & offset_mask);
}
- b0->data = memif_get_buffer (c, ring, slot & mask);
+ b0->data = memif_get_buffer (c, ring, mq->next_buf & mask);
src_left -= b0->len;
dst_left -= b0->len;
}
- slot++;
*count_out += 1;
- mq->alloc_bufs++;
+ mq->next_buf++;
ns--;
count--;
}
no_ns:
- DBG ("allocated: %u/%u bufs. Total %u allocated bufs", *count_out, count,
- mq->alloc_bufs);
+ DBG ("allocated: %u/%u bufs. Next buffer pointer %d", *count_out, count,
+ mq->next_buf);
if (count)
{
run_args.num_m2s_rings;
if (EXPECT_FALSE (qid >= num))
return MEMIF_ERR_QID;
- libmemif_main_t *lm = &libmemif_main;
+ libmemif_main_t *lm = get_libmemif_main (c->args.socket);
memif_queue_t *mq = &c->rx_queues[qid];
memif_ring_t *ring = mq->ring;
uint16_t mask = (1 << mq->log2_ring_size) - 1;
uint16_t mask = (1 << mq->log2_ring_size) - 1;
memif_buffer_t *b0;
*tx = 0;
-
- if (count > mq->alloc_bufs)
- count = mq->alloc_bufs;
+ int err = MEMIF_ERR_SUCCESS;
if (EXPECT_FALSE (count == 0))
return MEMIF_ERR_SUCCESS;
+ uint16_t index;
+ if (c->args.is_master)
+ index = ring->tail;
+ else
+ index = ring->head;
+
while (count)
{
b0 = (bufs + *tx);
+ /* set error to MEMIF_ERR_INVAL_ARG and finish the sending process
+ */
+ if ((b0->desc_index & mask) != (index & mask))
+ {
+ err = MEMIF_ERR_INVAL_ARG;
+ goto done;
+ }
ring->desc[b0->desc_index & mask].length = b0->len;
#ifdef MEMIF_DBG_SHM
*tx += 1;
count--;
+ index++;
}
-
+done:
MEMIF_MEMORY_BARRIER ();
if (c->args.is_master)
ring->tail = b0->desc_index + 1;
else
ring->head = b0->desc_index + 1;
- mq->alloc_bufs -= *tx;
-
if ((ring->flags & MEMIF_RING_FLAG_MASK_INT) == 0)
{
uint64_t a = 1;
return MEMIF_ERR_INT_WRITE;
}
- return MEMIF_ERR_SUCCESS; /* 0 */
+ return err;
}
int
*rx = 0;
uint64_t b;
- ssize_t r = read (mq->int_fd, &b, sizeof (b));
- if (EXPECT_FALSE ((r == -1) && (errno != EAGAIN)))
- return memif_syscall_error_handler (errno);
+ ssize_t r;
cur_slot = (c->args.is_master) ? mq->last_head : mq->last_tail;
last_slot = (c->args.is_master) ? ring->head : ring->tail;
if (cur_slot == last_slot)
- return MEMIF_ERR_SUCCESS;
+ {
+ r = read (mq->int_fd, &b, sizeof (b));
+ if (EXPECT_FALSE ((r == -1) && (errno != EAGAIN)))
+ return memif_syscall_error_handler (errno);
+
+ return MEMIF_ERR_SUCCESS;
+ }
ns = last_slot - cur_slot;
ring->desc[cur_slot & mask].length = c->run_args.buffer_size;
}
- b0->flags = MEMIF_BUFFER_FLAG_RX;
if (ring->desc[cur_slot & mask].flags & MEMIF_DESC_FLAG_NEXT)
{
b0->flags |= MEMIF_BUFFER_FLAG_NEXT;
ring->desc[cur_slot & mask].flags &= ~MEMIF_DESC_FLAG_NEXT;
}
/* b0->offset = ring->desc[cur_slot & mask].offset;*/
- b0->ring = ring;
+ b0->queue = mq;
#ifdef MEMIF_DBG_SHM
printf ("data: %p\n", b0->data);
printf ("index: %u\n", b0->desc_index);
- printf ("ring: %p\n", b0->ring);
+ printf ("queue: %p\n", b0->queue);
print_bytes (b0->data, b0->len, DBG_RX_BUF);
#endif /* MEMIF_DBG_SHM */
ns--;
return MEMIF_ERR_NOBUF;
}
+ r = read (mq->int_fd, &b, sizeof (b));
+ if (EXPECT_FALSE ((r == -1) && (errno != EAGAIN)))
+ return memif_syscall_error_handler (errno);
+
return MEMIF_ERR_SUCCESS; /* 0 */
}
memif_get_details (memif_conn_handle_t conn, memif_details_t * md,
char *buf, ssize_t buflen)
{
- libmemif_main_t *lm = &libmemif_main;
memif_connection_t *c = (memif_connection_t *) conn;
+ libmemif_main_t *lm;
memif_socket_t *ms;
int err = MEMIF_ERR_SUCCESS, i;
ssize_t l0 = 0, l1;
return MEMIF_ERR_NOCONN;
ms = (memif_socket_t *) c->args.socket;
+ lm = get_libmemif_main (ms);
l1 = strlen ((char *) c->args.interface_name);
if (l0 + l1 < buflen)
memif_cleanup ()
{
libmemif_main_t *lm = &libmemif_main;
+ int err;
+
+ err = memif_delete_socket ((memif_socket_handle_t *) & lm->default_socket);
+ if (err != MEMIF_ERR_SUCCESS)
+ return err;
+
+ if (lm->control_list)
+ lm->free (lm->control_list);
+ lm->control_list = NULL;
+ if (lm->interrupt_list)
+ lm->free (lm->interrupt_list);
+ lm->interrupt_list = NULL;
+ if (lm->socket_list)
+ lm->free (lm->socket_list);
+ lm->socket_list = NULL;
+ if (lm->pending_list)
+ lm->free (lm->pending_list);
+ lm->pending_list = NULL;
+ if (lm->poll_cancel_fd != -1)
+ close (lm->poll_cancel_fd);
+
+ return MEMIF_ERR_SUCCESS; /* 0 */
+}
+
+int
+memif_per_thread_cleanup (memif_per_thread_main_handle_t * pt_main)
+{
+ libmemif_main_t *lm = (libmemif_main_t *) * pt_main;
- memif_delete_socket ((memif_socket_handle_t *) &lm->default_socket);
+ if (lm == NULL)
+ return MEMIF_ERR_INVAL_ARG;
+
+ /* No default socket in case of per thread */
if (lm->control_list)
lm->free (lm->control_list);
if (lm->pending_list)
lm->free (lm->pending_list);
lm->pending_list = NULL;
- if (poll_cancel_fd != -1)
- close (poll_cancel_fd);
+ if (lm->poll_cancel_fd != -1)
+ close (lm->poll_cancel_fd);
+
+ lm->free (lm);
+
+ *pt_main = NULL;
return MEMIF_ERR_SUCCESS; /* 0 */
}
Code Review / vpp.git / blobdiff