Updated PKGBUILD and Cpack with new license.

Avoid waiting undefinitely in modules_dispatch if no POLLIN data is available.

Author: FedeDP

CMakeLists.txt

@@ -120,6 +120,7 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -fvisibility=hidden")
 # Packaging support
 # THANKS to libkqueue CMakeLists.txt for packaging support :)
 #
+SET(CPACK_SET_DESTDIR "on")
 set(CPACK_PACKAGE_NAME ${PROJECT_NAME})
 set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
 set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
@@ -129,38 +130,24 @@ set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
 #
 #  Metadata common to all packaging systems
 #
+set(CPACK_PACKAGE_CONTACT "Federico Di Pierro <[email protected]>")
+set(CPACK_PACKAGE_DESCRIPTION "Libmodule offers a small and simple implementation of an actor library, aiming at letting developers easily create modular C projects in a way which is both simple and elegant.")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Small and simple implementation of an actor library for C.")
-set(CPACK_COMPONENT_MAIN_DESCRIPTION "Libmodule offers a small and simple implementation of an actor library, aiming at letting developers easily create modular C projects in a way which is both simple and elegant.")
-set(CPACK_COMPONENT_DEVEL_DESCRIPTION "Development files for ${PROJECT_NAME}-${PROJECT_VERSION}")
 
 #
 #  RPM Specific configuration
 #
-set(CPACK_RPM_PACKAGE_LICENSE "GPL-3.0")
+set(CPACK_RPM_PACKAGE_LICENSE "MIT")
 set(CPACK_RPM_PACKAGE_URL "https://github.com/FedeDP/libmodule")
-
-set(CPACK_RPM_MAIN_PACKAGE_GROUP "System Environment/Libraries")
-set(CPACK_RPM_MAIN_PACKAGE_DESCRIPTION ${CPACK_COMPONENT_MAIN_DESCRIPTION})
-
-set(CPACK_RPM_DEVEL_PACKAGE_GROUP "Development/Libraries")
-set(CPACK_RPM_DEVEL_PACKAGE_SUMMARY ${CPACK_COMPONENT_DEVEL_DESCRIPTION})
-set(CPACK_RPM_DEVEL_PACKAGE_REQUIRES "${CPACK_PACKAGE_NAME} = %{version}-%{release}")
-
-set(CPACK_RPM_COMPONENT_INSTALL OFF)            # Enable component based packaging (generate multiple packages)
-set(CPACK_RPM_FILE_NAME RPM-DEFAULT)            # Use rpmbuild's package naming scheme
+set(CPACK_RPM_PACKAGE_GROUP "System Environment/Libraries")
+set(CPACK_RPM_PACKAGE_DESCRIPTION ${CPACK_PACKAGE_DESCRIPTION})
+set(CPACK_RPM_FILE_NAME RPM-DEFAULT)
 
 #
 #  DEB Specific configuration
 #
-set(CPACK_DEBIAN_MAIN_PACKAGE_NAME "${CPACK_PACKAGE_NAME}")
-set(CPACK_DEBIAN_MAIN_PACKAGE_SECTION "libs")
-set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Federico Di Pierro <[email protected]>")
-
-set(CPACK_DEBIAN_DEVEL_PACKAGE_NAME "${CPACK_PACKAGE_NAME}-dev")
-set(CPACK_DEBIAN_DEVEL_PACKAGE_SECTION "libdevel")
-set(CPACK_DEBIAN_DEVEL_PACKAGE_DEPENDS "${CPACK_PACKAGE_NAME} (= ${PROJECT_VERSION})")
-
-set(CPACK_DEB_COMPONENT_INSTALL OFF)            # Enable component based packaging (generate multiple packages)
-set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)         # Use default Debian package naming scheme
+set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/FedeDP/libmodule")
+set(CPACK_DEBIAN_PACKAGE_SECTION "libs")
+set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
 
 include(CPack)

Extra/Arch/PKGBUILD

@@ -4,9 +4,9 @@ pkgname=libmodule
 pkgver=3.2.0
 pkgrel=1
 pkgdesc="C linux library to build simple and modular projects"
-arch=(x86_64)
+arch=(any)
 url="https://github.com/FedeDP/${pkgname}"
-license=(GPL)
+license=(MIT)
 depends=()
 makedepends=(git cmake)
 source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz")

Lib/modules.c

@@ -5,7 +5,7 @@ static _ctor1_ void modules_init(void);
 static _dtor0_ void modules_destroy(void);
 static void evaluate_new_state(m_context *c);
 static module_ret_code loop_start(m_context *c, const int max_events);
-static int recv_events(m_context *c);
+static int recv_events(m_context *c, int timeout);
 static int loop_stop(m_context *c);
 
 map_t *ctx;
@@ -39,8 +39,8 @@ static module_ret_code loop_start(m_context *c, const int max_events) {
     return MOD_ERR;
 }
 
-static int recv_events(m_context *c) {
-    int nfds = poll_wait(c->fd, c->max_events, c->pevents);
+static int recv_events(m_context *c, int timeout) {
+    int nfds = poll_wait(c->fd, c->max_events, c->pevents, timeout);
     for (int i = 0; i < nfds; i++) {
         module_poll_t *p = poll_recv(i, c->pevents);
         if (p && p->self && p->self->mod) {
@@ -140,7 +140,7 @@ module_ret_code modules_ctx_loop_events(const char *ctx_name, const int max_even
 
     if (loop_start(c, max_events) == MOD_OK) {
         while (!c->quit) {
-            recv_events(c);
+            recv_events(c, -1);
         }
         return loop_stop(c);
     }
@@ -184,7 +184,7 @@ module_ret_code modules_ctx_dispatch(const char *ctx_name, int *ret) {
         return MOD_ERR; 
     }
 
-    /* Recv new events */
-    *ret = recv_events(c);
+    /* Recv new events, no timeout */
+    *ret = recv_events(c, 0);
     return *ret >= 0 ? MOD_OK : MOD_ERR;
 }

Lib/poll_plugins/epoll_priv.c

@@ -30,8 +30,8 @@ int poll_init_pevents(void **pevents, int max_events) {
     return MOD_OK;
 }
 
-int poll_wait(int fd, int max_events, void *pevents) {
-    return epoll_wait(fd, (struct epoll_event *) pevents, max_events, -1);
+int poll_wait(int fd, int max_events, void *pevents, int timeout) {
+    return epoll_wait(fd, (struct epoll_event *) pevents, max_events, timeout);
 }
 
 module_poll_t *poll_recv(int idx, void *pevents) {

Lib/poll_plugins/kqueue_priv.c

@@ -33,8 +33,10 @@ int poll_init_pevents(void **pevents, int max_events) {
     return MOD_OK;
 }
 
-int poll_wait(int fd, int max_events, void *pevents) {
-    return kevent(fd, NULL, 0, (struct kevent *)pevents, max_events, NULL);
+int poll_wait(int fd, int max_events, void *pevents, int timeout) {
+    struct timespec t = {0};
+    t.tv_sec = timeout;
+    return kevent(fd, NULL, 0, (struct kevent *)pevents, max_events, timeout >= 0 ? &t : NULL);
 }
 
 module_poll_t *poll_recv(int idx, void *pevents) {

Lib/poll_priv.h

@@ -12,7 +12,7 @@ int poll_create(void);
 int poll_set_data(void **_ev);
 int poll_set_new_evt(module_poll_t *tmp, m_context *c, enum op_type flag);
 int poll_init_pevents(void **pevents, int max_events);
-int poll_wait(int fd, int max_events, void *pevents);
+int poll_wait(int fd, int max_events, void *pevents, int timeout);
 module_poll_t *poll_recv(int idx, void *pevents);
 int poll_destroy_pevents(void **pevents, int *max_events);
 int poll_close(int fd, void **pevents, int *max_events);

TODO.md

@@ -5,7 +5,7 @@
 - [x] modules_get_fd(const char *ctx)
 - [x] modules_dispatch(ctx)
 - [x] Update Doc
-- [ ] Add tests?
+- [x] Avoid waiting undefinitely when calling modules_dispatch if no POLLIN data is ready
 
 ### Fixes
 - [x] In stack_clear and map_clear, avoid unsetting dtor