libmemif: version 3.0

Add support for multi-thread connection establishment.

- control_fd_update() callback now passes private context
  associated with updated file descriptor. File descriptor
  can belong to memif socket, memif connection or timerfd.
  In case of timerfd the context is NULL.

- memif_create_socket() new API. Creates memif socket
  handle to be passed to memif_create() in memif_conn_args_t.
  This API allows to pass private context whenever the file
  descriptor is updated.

- memif_delete_socket() new API. Deletes memif socket.
  Socket must not be in use by any interface.

Type: feature

Change-Id: I7ca4e4349595d4477195f1c32403d3e3a6eb5361
Signed-off-by: Jakub Grajciar <jgrajcia@cisco.com>

3 files changed, 2 insertions, 7 deletions

diff --git a/extras/libmemif/test/main_test.c b/extras/libmemif/test/main_test.c
index 6c29babcb2e..0a8e091f395 100644
--- a/extras/libmemif/test/main_test.c
+++ b/extras/libmemif/test/main_test.c
@@ -148,7 +148,6 @@ START_TEST (test_create)
   ck_assert_ptr_ne (c->on_interrupt, NULL);
 
   ck_assert_str_eq ((char *)c->args.interface_name, (char *)args.interface_name);
-  ck_assert_str_eq ((char *)c->args.socket_filename, SOCKET_FILENAME);
 
   struct itimerspec timer;
   timerfd_gettime (lm->timerfd, &timer);
@@ -210,7 +209,6 @@ START_TEST (test_create_master)
   ck_assert_ptr_ne (c->on_interrupt, NULL);
 
   ck_assert_str_eq ((char *)c->args.interface_name, (char *)args.interface_name);
-  ck_assert_str_eq ((char *)c->args.socket_filename, SOCKET_FILENAME);
 
   struct stat file_stat;
 
@@ -295,9 +293,7 @@ START_TEST (test_create_mult)
   ck_assert_ptr_ne (c1->on_interrupt, NULL);
 
   ck_assert_str_eq ((char *)c->args.interface_name, (char *)args.interface_name);
-  ck_assert_str_eq ((char *)c->args.socket_filename, SOCKET_FILENAME);
   ck_assert_str_eq ((char *)c1->args.interface_name, (char *)args.interface_name);
-  ck_assert_str_eq ((char *)c1->args.socket_filename, SOCKET_FILENAME);
 
   struct itimerspec timer;
   timerfd_gettime (lm->timerfd, &timer);
@@ -720,7 +716,6 @@ START_TEST (test_get_details)
   ck_assert_str_eq ((char *)md.remote_if_name, (char *)c->remote_if_name);
   ck_assert_str_eq ((char *)md.remote_inst_name, (char *)c->remote_name);
   ck_assert_str_eq ((char *)md.secret, (char *)c->args.secret);
-  ck_assert_str_eq ((char *)md.socket_filename, (char *)c->args.socket_filename);
 
   ck_assert_uint_eq (md.id, c->args.interface_id);
   ck_assert_uint_ne (md.role, c->args.is_master);
diff --git a/extras/libmemif/test/unit_test.c b/extras/libmemif/test/unit_test.c
index 9c9a8d4de66..0ae045b9573 100644
--- a/extras/libmemif/test/unit_test.c
+++ b/extras/libmemif/test/unit_test.c
@@ -37,7 +37,7 @@ on_interrupt (memif_conn_handle_t conn, void *ctx, uint16_t qid)
 }
 
 int
-control_fd_update (int fd, uint8_t events)
+control_fd_update (int fd, uint8_t events, void *ctx)
 {
   return 0;
 }
diff --git a/extras/libmemif/test/unit_test.h b/extras/libmemif/test/unit_test.h
index a24887d7fca..3182c77e6e6 100644
--- a/extras/libmemif/test/unit_test.h
+++ b/extras/libmemif/test/unit_test.h
@@ -34,6 +34,6 @@ int on_disconnect (memif_conn_handle_t conn, void *ctx);
 
 int on_interrupt (memif_conn_handle_t conn, void *ctx, uint16_t qid);
 
-int control_fd_update (int fd, uint8_t events);
+int control_fd_update (int fd, uint8_t events, void *ctx);
 
 #endif /* _UNIT_TEST_H_ */