indent

Author: fredrikwidlund

CHANGES

@@ -53,3 +53,12 @@ Released 2020-12-25
 
   - Add counters
   - Add abort
+
+Version 2.3
+===========
+
+Released 2021-01-02
+
+* New features:
+
+  - Pool refactoring

README.rst

@@ -1,4 +1,4 @@
-libdynamic v2.2
+libdynamic v2.3
 ===============
 
 .. image:: https://travis-ci.org/fredrikwidlund/libdynamic.svg?branch=master
@@ -47,9 +47,9 @@ Build from release
 
 .. code-block:: shell
 
-    wget https://github.com/fredrikwidlund/libdynamic/releases/download/v2.2.0/libdynamic-2.2.0.tar.gz
-    tar fxz libdynamic-2.2.0.tar.gz
-    cd libdynamic-2.2.0
+    wget https://github.com/fredrikwidlund/libdynamic/releases/download/v2.3.0/libdynamic-2.3.0.tar.gz
+    tar fxz libdynamic-2.3.0.tar.gz
+    cd libdynamic-2.3.0
     ./configure
     make install
 

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([libdynamic], [2.2.0], [fredrik.widlund@gmail.com])
+AC_INIT([libdynamic],[2.3.0],[fredrik.widlund@gmail.com])
 AC_CONFIG_AUX_DIR(autotools)
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign no-define])
@@ -7,7 +7,7 @@ AM_INIT_AUTOMAKE([-Wall -Werror foreign no-define])
 : ${CXXFLAGS="-Wall -Wextra -Wpedantic"}
 
 AM_PROG_AR
-AC_PROG_LIBTOOL
+LT_INIT
 AM_PROG_CC_C_O
 AC_PROG_CXX
 

examples/async.c

@@ -16,21 +16,15 @@ struct state
   _Atomic size_t jobs;
 };
 
-void async(void *state)
-{
-  usleep(10000);
-  ((struct state *) state)->jobs++;
-}
-
-core_status collect(core_event *event)
+static core_status async(core_event *event)
 {
   struct state *state = event->state;
-  void *result;
-
-  do
-    result = pool_collect(&state->pool, POOL_DONTWAIT);
-  while (result);
 
+  if (event->type == POOL_REQUEST)
+  {
+    usleep(10000);
+    state->jobs++;
+  }
   return CORE_OK;
 }
 
@@ -68,12 +62,12 @@ int main()
   struct state state = {0};
 
   core_construct(&state.core);
-  pool_construct(&state.pool);
+  pool_construct(&state.pool, &state.core);
+  pool_limits(&state.pool, 1, 32);
 
   state.timer = timerfd_create(CLOCK_REALTIME, TFD_NONBLOCK | TFD_CLOEXEC);
   timerfd_settime(state.timer, 0, (struct itimerspec[]) {{{1, 0}, {1, 0}}}, NULL);
   core_add(&state.core, timeout, &state, state.timer, EPOLLIN | EPOLLET);
-  core_add(&state.core, collect, &state, pool_fd(&state.pool), EPOLLIN | EPOLLET);
 
   core_loop(&state.core);
 

src/dynamic.h

@@ -1,9 +1,9 @@
 #ifndef DYNAMIC_H_INCLUDED
 #define DYNAMIC_H_INCLUDED
 
-#define DYNAMIC_VERSION "2.2.0"
+#define DYNAMIC_VERSION "2.3.0"
 #define DYNAMIC_VERSION_MAJOR 2
-#define DYNAMIC_VERSION_MINOR 2
+#define DYNAMIC_VERSION_MINOR 3
 #define DYNAMIC_VERSION_PATCH 0
 
 #define dynamic_likely(x)   __builtin_expect(!!(x), 1)
@@ -27,8 +27,8 @@ extern "C" {
 #include <dynamic/map.h>
 #include <dynamic/maps.h>
 #include <dynamic/mapi.h>
-#include <dynamic/pool.h>
 #include <dynamic/core.h>
+#include <dynamic/pool.h>
 
 #ifdef __cplusplus
 }

src/dynamic/buffer.h

@@ -1,5 +1,5 @@
-#ifndef BUFFER_H_INCLUDED
-#define BUFFER_H_INCLUDED
+#ifndef DYNAMIC_BUFFER_H_INCLUDED
+#define DYNAMIC_BUFFER_H_INCLUDED
 
 typedef struct buffer buffer;
 struct buffer
@@ -29,4 +29,4 @@ void    buffer_clear(buffer *);
 /* element access */
 void   *buffer_data(buffer *);
 
-#endif /* BUFFER_H_INCLUDED */
+#endif /* DYNAMIC_BUFFER_H_INCLUDED */

src/dynamic/core.c

@@ -8,6 +8,8 @@
 #include "buffer.h"
 #include "vector.h"
 #include "core.h"
+#include "segment.h"
+#include "utility.h"
 
 static __thread core core_default = {0};
 
@@ -19,28 +21,13 @@ static core_status core_default_callback(core_event *event __attribute__((unused
   return CORE_OK;
 }
 
-static uint64_t core_tsc(void)
-{
-#if defined(__x86_64__) || defined(__amd64__)
-  uint32_t lo, hi;
-  __asm__ volatile("RDTSC"
-                   : "=a"(lo), "=d"(hi));
-  return (((uint64_t) hi) << 32) | lo;
-#else
-  return 0;
-#endif
-}
-
 static core *core_get(core *core)
 {
   return core ? core : &core_default;
 }
 
 void core_construct(core *core)
 {
-  if (core)
-    *core = (struct core) {0};
-
   core = core_get(core);
   if (!core->ref)
   {
@@ -85,20 +72,20 @@ void core_loop(core *core)
   uint64_t t0, t1;
   int n, i;
 
-  t1 = core_tsc();
+  t1 = utility_tsc();
   core = core_get(core);
   while (core->active && core->errors == 0 && (core->handlers_active || vector_size(&core->next)))
   {
     for (i = 0; (size_t) i < vector_size(&core->next); i++)
       (void) core_dispatch(vector_at(&core->next, i), 0, 0);
     vector_clear(&core->next, NULL);
 
-    t0 = core_tsc();
+    t0 = utility_tsc();
     core->time = 0;
     n = core->handlers_active ? epoll_wait(core->fd, events, CORE_MAX_EVENTS, -1) : 0;
     core->errors += n == -1;
     core->counters.awake += t0 - t1;
-    t1 = core_tsc();
+    t1 = utility_tsc();
     core->counters.sleep += t1 - t0;
     core->counters.polls++;
     core->counters.events += n;
@@ -158,7 +145,7 @@ void core_delete(core *core, int fd)
   core->handlers_active--;
 }
 
-int core_next(core *core, core_callback *callback, void *state)
+core_id core_next(core *core, core_callback *callback, void *state)
 {
   core_handler handler = {.callback = callback, .state = state};
 
@@ -167,7 +154,7 @@ int core_next(core *core, core_callback *callback, void *state)
   return vector_size(&core->next);
 }
 
-void core_cancel(core *core, int id)
+void core_cancel(core *core, core_id id)
 {
   core_handler *handlers;
 
@@ -179,7 +166,7 @@ void core_cancel(core *core, int id)
   handlers[id - 1] = core_handler_default;
 }
 
-int core_errors(core *core)
+size_t core_errors(core *core)
 {
   core = core_get(core);
   return core->errors;

src/dynamic/core.h

@@ -1,5 +1,5 @@
-#ifndef CORE_H_INCLUDED
-#define CORE_H_INCLUDED
+#ifndef DYNAMIC_CORE_H_INCLUDED
+#define DYNAMIC_CORE_H_INCLUDED
 
 #define CORE_MAX_EVENTS 16
 
@@ -9,6 +9,7 @@ enum core_status
   CORE_ABORT = -1
 };
 
+typedef uintptr_t            core_id;
 typedef enum core_status     core_status;
 typedef struct core_event    core_event;
 typedef core_status          core_callback(core_event *);
@@ -42,7 +43,7 @@ struct core
   size_t         ref;
   int            fd;
   int            active;
-  int            errors;
+  size_t         errors;
   vector         handlers;
   size_t         handlers_active;
   vector         next;
@@ -58,11 +59,11 @@ void           core_loop(core *);
 void           core_add(core *, core_callback *, void *, int, int);
 void           core_modify(core *, int, int);
 void           core_delete(core *, int);
-int            core_next(core *, core_callback *, void *);
-void           core_cancel(core *, int);
-int            core_errors(core *);
+core_id        core_next(core *, core_callback *, void *);
+void           core_cancel(core *, core_id);
+size_t         core_errors(core *);
 uint64_t       core_now(core *);
 core_counters *core_get_counters(core *);
 void           core_clear_counters(core *);
 
-#endif /* CORE_H_INCLUDED */
+#endif /* DYNAMIC_CORE_H_INCLUDED */

src/dynamic/hash.h

@@ -1,8 +1,8 @@
-#ifndef HASH_H_INCLUDED
-#define HASH_H_INCLUDED
+#ifndef DYNAMIC_HASH_HINCLUDED
+#define DYNAMIC_HASH_HINCLUDED
 
 uint64_t hash_string(char *);
 uint64_t hash_data(void *, size_t);
 uint64_t hash_uint64(uint64_t);
 
-#endif /* HASH_H_INCLUDED */
+#endif /* DYNAMIC_HASH_HINCLUDED */