Merged branch 'master' of git://git.tokkee.org/sysdb.

diff --git a/src/core/plugin.c b/src/core/plugin.c
index d1f7541a3b61824b66eecb27c6f2d29fcc3c233b..eb9797fb40f8ba694f687acec082792877d115fd 100644 (file)
--- a/src/core/plugin.c
+++ b/src/core/plugin.c
@@ -1005,13 +1005,21 @@ sdb_plugin_collector_loop(sdb_plugin_loop_t *loop)
                                        sdb_log(SDB_LOG_ERR, "core: Failed to sleep "
                                                        "in collector main loop: %s",
                                                        sdb_strerror(errno, errbuf, sizeof(errbuf)));
+                                       sdb_llist_insert_sorted(collector_list, obj,
+                                                       plugin_cmp_next_update);
+                                       sdb_object_deref(obj);
                                        return -1;
                                }
                                errno = 0;
                        }
 
-                       if (! loop->do_loop)
+                       if (! loop->do_loop) {
+                               /* put back; don't worry about errors */
+                               sdb_llist_insert_sorted(collector_list, obj,
+                                               plugin_cmp_next_update);
+                               sdb_object_deref(obj);
                                return 0;
+                       }
                }
 
                old_ctx = ctx_set(SDB_PLUGIN_CCB(obj)->ccb_ctx);

diff --git a/t/frontend/connection_test.c b/t/frontend/connection_test.c
index 9936511c87200a2e528ec7584be52a36017391ea..9851a86a54aa8d68229371779b292a462afd7014 100644 (file)
--- a/t/frontend/connection_test.c
+++ b/t/frontend/connection_test.c
@@ -41,7 +41,11 @@
 #include <string.h>
 #include <unistd.h>
 
+#include <pthread.h>
+
 #include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/un.h>
 
 /*
  * private helper functions
@@ -110,10 +114,92 @@ mock_conn_truncate(sdb_conn_t *conn)
        ftruncate(conn->fd, 0);
 } /* mock_conn_truncate */
 
+static int
+mock_unixsock_listener(char *sock_path)
+{
+       struct sockaddr_un sa;
+       char *filename;
+       int fd, status;
+
+       filename = tmpnam(sock_path);
+       fail_unless(filename != NULL,
+                       "INTERNAL ERROR: tmpnam() = NULL; expected: a string");
+
+       fd = socket(AF_UNIX, SOCK_STREAM, 0);
+       fail_unless(fd >= 0,
+                       "INTERNAL ERROR: socket() = %d; expected: >=0", fd);
+
+       memset(&sa, 0, sizeof(sa));
+       sa.sun_family = AF_UNIX;
+       strncpy(sa.sun_path, filename, sizeof(sa.sun_path));
+
+       status = bind(fd, (struct sockaddr *)&sa, sizeof(sa));
+       fail_unless(status == 0,
+                       "INTERNAL ERROR: bind() = %d; expected: 0", status);
+       status = listen(fd, 32);
+       fail_unless(status == 0,
+                       "INTERNAL ERROR: listen() = %d; expected: 0", status);
+
+       return fd;
+} /* mock_unixsock */
+
+static void *
+mock_client(void *arg)
+{
+       char *socket_path = arg;
+
+       struct sockaddr_un sa;
+       int fd, check;
+
+       fd = socket(AF_UNIX, SOCK_STREAM, /* protocol = */ 0);
+       fail_unless(fd >= 0,
+                       "INTERNAL ERROR: socket() = %d; expected: >= 0", fd);
+
+       memset(&sa, 0, sizeof(sa));
+       sa.sun_family = AF_UNIX;
+       strncpy(sa.sun_path, socket_path, sizeof(sa.sun_path));
+
+       check = connect(fd, (struct sockaddr *)&sa, sizeof(sa));
+       fail_unless(check == 0,
+                       "INTERNAL ERROR: connect() = %d; expected: 0", check);
+
+       close(fd);
+       return NULL;
+} /* mock_client */
+
 /*
  * tests
  */
 
+START_TEST(test_conn_accept)
+{
+       char socket_path[L_tmpnam];
+       int fd, check;
+
+       sdb_conn_t *conn;
+
+       pthread_t thr;
+
+       conn = sdb_connection_accept(-1);
+       fail_unless(conn == NULL,
+                       "sdb_connection_accept(-1) = %p; expected: NULL", conn);
+
+       memset(&socket_path, 0, sizeof(socket_path));
+       fd = mock_unixsock_listener(socket_path);
+       check = pthread_create(&thr, /* attr = */ NULL, mock_client, socket_path);
+       fail_unless(check == 0,
+                       "INTERNAL ERROR: pthread_create() = %i; expected: 0", check);
+
+       conn = sdb_connection_accept(fd);
+       fail_unless(conn != NULL,
+                       "sdb_connection_accept(%d) = %p; expected: <conn>", fd, conn);
+
+       unlink(socket_path);
+       sdb_connection_close(conn);
+       pthread_join(thr, NULL);
+}
+END_TEST
+
 START_TEST(test_conn_setup)
 {
        sdb_conn_t *conn = mock_conn_create();
@@ -188,6 +274,7 @@ fe_conn_suite(void)
        TCase *tc;
 
        tc = tcase_create("core");
+       tcase_add_test(tc, test_conn_accept);
        tcase_add_test(tc, test_conn_setup);
        suite_add_tcase(s, tc);