trace.h: Use side_ptr_t for event description
[libside.git] / src / side.c
index b6f7dd56171c52216f0287840646720a12ee6ea2..67a5bd459a15734e40287c72d57dc57d6a65c91b 100644 (file)
@@ -6,7 +6,6 @@
 #include <side/trace.h>
 #include <string.h>
 
-#include "tracer.h"
 #include "rcu.h"
 #include "list.h"
 
@@ -61,15 +60,13 @@ static DEFINE_SIDE_LIST_HEAD(side_tracer_list);
  * The empty callback has a NULL function callback pointer, which stops
  * iteration on the array of callbacks immediately.
  */
-const struct side_callback side_empty_callback;
+const struct side_callback side_empty_callback = { };
 
-void side_init(void) __attribute__((constructor));
-void side_exit(void) __attribute__((destructor));
-
-void side_call(const struct side_event_description *desc, const struct side_arg_vec_description *sav_desc)
+void side_call(const struct side_event_description *desc, const struct side_arg_vec *side_arg_vec)
 {
+       struct side_event_state *event_state;
+       struct side_rcu_read_state rcu_read_state;
        const struct side_callback *side_cb;
-       unsigned int rcu_period;
        uintptr_t enabled;
 
        if (side_unlikely(finalized))
@@ -80,22 +77,24 @@ void side_call(const struct side_event_description *desc, const struct side_arg_
                printf("ERROR: unexpected variadic event description\n");
                abort();
        }
-       enabled = __atomic_load_n(desc->enabled, __ATOMIC_RELAXED);
+       event_state = side_ptr_get(desc->state);
+       enabled = __atomic_load_n(&event_state->enabled, __ATOMIC_RELAXED);
        if (side_unlikely(enabled & SIDE_EVENT_ENABLED_KERNEL_USER_EVENT_MASK)) {
                // TODO: call kernel write.
        }
-       rcu_period = side_rcu_read_begin(&rcu_gp);
-       for (side_cb = side_rcu_dereference(desc->callbacks); side_cb->u.call != NULL; side_cb++)
-               side_cb->u.call(desc, sav_desc, side_cb->priv);
-       side_rcu_read_end(&rcu_gp, rcu_period);
+       side_rcu_read_begin(&rcu_gp, &rcu_read_state);
+       for (side_cb = side_rcu_dereference(event_state->callbacks); side_cb->u.call != NULL; side_cb++)
+               side_cb->u.call(desc, side_arg_vec, side_cb->priv);
+       side_rcu_read_end(&rcu_gp, &rcu_read_state);
 }
 
 void side_call_variadic(const struct side_event_description *desc,
-       const struct side_arg_vec_description *sav_desc,
-       const struct side_arg_dynamic_event_struct *var_struct)
+       const struct side_arg_vec *side_arg_vec,
+       const struct side_arg_dynamic_struct *var_struct)
 {
+       struct side_event_state *event_state;
+       struct side_rcu_read_state rcu_read_state;
        const struct side_callback *side_cb;
-       unsigned int rcu_period;
        uintptr_t enabled;
 
        if (side_unlikely(finalized))
@@ -106,25 +105,27 @@ void side_call_variadic(const struct side_event_description *desc,
                printf("ERROR: unexpected non-variadic event description\n");
                abort();
        }
-       enabled = __atomic_load_n(desc->enabled, __ATOMIC_RELAXED);
+       event_state = side_ptr_get(desc->state);
+       enabled = __atomic_load_n(&event_state->enabled, __ATOMIC_RELAXED);
        if (side_unlikely(enabled & SIDE_EVENT_ENABLED_KERNEL_USER_EVENT_MASK)) {
                // TODO: call kernel write.
        }
-       rcu_period = side_rcu_read_begin(&rcu_gp);
-       for (side_cb = side_rcu_dereference(desc->callbacks); side_cb->u.call_variadic != NULL; side_cb++)
-               side_cb->u.call_variadic(desc, sav_desc, var_struct, side_cb->priv);
-       side_rcu_read_end(&rcu_gp, rcu_period);
+       side_rcu_read_begin(&rcu_gp, &rcu_read_state);
+       for (side_cb = side_rcu_dereference(event_state->callbacks); side_cb->u.call_variadic != NULL; side_cb++)
+               side_cb->u.call_variadic(desc, side_arg_vec, var_struct, side_cb->priv);
+       side_rcu_read_end(&rcu_gp, &rcu_read_state);
 }
 
 static
 const struct side_callback *side_tracer_callback_lookup(
                const struct side_event_description *desc,
-               void (*call)(), void *priv)
+               void *call, void *priv)
 {
+       struct side_event_state *event_state = side_ptr_get(desc->state);
        const struct side_callback *cb;
 
-       for (cb = desc->callbacks; cb->u.call != NULL; cb++) {
-               if (cb->u.call == call && cb->priv == priv)
+       for (cb = event_state->callbacks; cb->u.call != NULL; cb++) {
+               if ((void *) cb->u.call == call && cb->priv == priv)
                        return cb;
        }
        return NULL;
@@ -132,8 +133,9 @@ const struct side_callback *side_tracer_callback_lookup(
 
 static
 int _side_tracer_callback_register(struct side_event_description *desc,
-               void (*call)(), void *priv)
+               void *call, void *priv)
 {
+       struct side_event_state *event_state;
        struct side_callback *old_cb, *new_cb;
        int ret = SIDE_ERROR_OK;
        uint32_t old_nr_cb;
@@ -145,7 +147,8 @@ int _side_tracer_callback_register(struct side_event_description *desc,
        if (!initialized)
                side_init();
        pthread_mutex_lock(&side_lock);
-       old_nr_cb = desc->nr_callbacks;
+       event_state = side_ptr_get(desc->state);
+       old_nr_cb = event_state->nr_callbacks;
        if (old_nr_cb == UINT32_MAX) {
                ret = SIDE_ERROR_INVAL;
                goto unlock;
@@ -155,7 +158,7 @@ int _side_tracer_callback_register(struct side_event_description *desc,
                ret = SIDE_ERROR_EXIST;
                goto unlock;
        }
-       old_cb = (struct side_callback *) desc->callbacks;
+       old_cb = (struct side_callback *) event_state->callbacks;
        /* old_nr_cb + 1 (new cb) + 1 (NULL) */
        new_cb = (struct side_callback *) calloc(old_nr_cb + 2, sizeof(struct side_callback));
        if (!new_cb) {
@@ -164,49 +167,47 @@ int _side_tracer_callback_register(struct side_event_description *desc,
        }
        memcpy(new_cb, old_cb, old_nr_cb);
        if (desc->flags & SIDE_EVENT_FLAG_VARIADIC)
-               new_cb[old_nr_cb].u.call_variadic = call;
+               new_cb[old_nr_cb].u.call_variadic =
+                       (side_tracer_callback_variadic_func) call;
        else
-               new_cb[old_nr_cb].u.call = call;
+               new_cb[old_nr_cb].u.call =
+                       (side_tracer_callback_func) call;
        new_cb[old_nr_cb].priv = priv;
-       side_rcu_assign_pointer(desc->callbacks, new_cb);
+       side_rcu_assign_pointer(event_state->callbacks, new_cb);
        side_rcu_wait_grace_period(&rcu_gp);
        if (old_nr_cb)
                free(old_cb);
-       desc->nr_callbacks++;
+       event_state->nr_callbacks++;
        /* Increment concurrently with kernel setting the top bits. */
        if (!old_nr_cb)
-               (void) __atomic_add_fetch(desc->enabled, 1, __ATOMIC_RELAXED);
+               (void) __atomic_add_fetch(&event_state->enabled, 1, __ATOMIC_RELAXED);
 unlock:
        pthread_mutex_unlock(&side_lock);
        return ret;
 }
 
 int side_tracer_callback_register(struct side_event_description *desc,
-               void (*call)(const struct side_event_description *desc,
-                       const struct side_arg_vec_description *sav_desc,
-                       void *priv),
+               side_tracer_callback_func call,
                void *priv)
 {
        if (desc->flags & SIDE_EVENT_FLAG_VARIADIC)
                return SIDE_ERROR_INVAL;
-       return _side_tracer_callback_register(desc, call, priv);
+       return _side_tracer_callback_register(desc, (void *) call, priv);
 }
 
 int side_tracer_callback_variadic_register(struct side_event_description *desc,
-               void (*call_variadic)(const struct side_event_description *desc,
-                       const struct side_arg_vec_description *sav_desc,
-                       const struct side_arg_dynamic_event_struct *var_struct,
-                       void *priv),
+               side_tracer_callback_variadic_func call_variadic,
                void *priv)
 {
        if (!(desc->flags & SIDE_EVENT_FLAG_VARIADIC))
                return SIDE_ERROR_INVAL;
-       return _side_tracer_callback_register(desc, call_variadic, priv);
+       return _side_tracer_callback_register(desc, (void *) call_variadic, priv);
 }
 
-int _side_tracer_callback_unregister(struct side_event_description *desc,
-               void (*call)(), void *priv)
+static int _side_tracer_callback_unregister(struct side_event_description *desc,
+               void *call, void *priv)
 {
+       struct side_event_state *event_state;
        struct side_callback *old_cb, *new_cb;
        const struct side_callback *cb_pos;
        uint32_t pos_idx;
@@ -220,17 +221,18 @@ int _side_tracer_callback_unregister(struct side_event_description *desc,
        if (!initialized)
                side_init();
        pthread_mutex_lock(&side_lock);
+       event_state = side_ptr_get(desc->state);
        cb_pos = side_tracer_callback_lookup(desc, call, priv);
        if (!cb_pos) {
                ret = SIDE_ERROR_NOENT;
                goto unlock;
        }
-       old_nr_cb = desc->nr_callbacks;
-       old_cb = (struct side_callback *) desc->callbacks;
+       old_nr_cb = event_state->nr_callbacks;
+       old_cb = (struct side_callback *) event_state->callbacks;
        if (old_nr_cb == 1) {
                new_cb = (struct side_callback *) &side_empty_callback;
        } else {
-               pos_idx = cb_pos - desc->callbacks;
+               pos_idx = cb_pos - event_state->callbacks;
                /* Remove entry at pos_idx. */
                /* old_nr_cb - 1 (removed cb) + 1 (NULL) */
                new_cb = (struct side_callback *) calloc(old_nr_cb, sizeof(struct side_callback));
@@ -241,39 +243,34 @@ int _side_tracer_callback_unregister(struct side_event_description *desc,
                memcpy(new_cb, old_cb, pos_idx);
                memcpy(&new_cb[pos_idx], &old_cb[pos_idx + 1], old_nr_cb - pos_idx - 1);
        }
-       side_rcu_assign_pointer(desc->callbacks, new_cb);
+       side_rcu_assign_pointer(event_state->callbacks, new_cb);
        side_rcu_wait_grace_period(&rcu_gp);
        free(old_cb);
-       desc->nr_callbacks--;
+       event_state->nr_callbacks--;
        /* Decrement concurrently with kernel setting the top bits. */
        if (old_nr_cb == 1)
-               (void) __atomic_add_fetch(desc->enabled, -1, __ATOMIC_RELAXED);
+               (void) __atomic_add_fetch(&event_state->enabled, -1, __ATOMIC_RELAXED);
 unlock:
        pthread_mutex_unlock(&side_lock);
        return ret;
 }
 
 int side_tracer_callback_unregister(struct side_event_description *desc,
-               void (*call)(const struct side_event_description *desc,
-                       const struct side_arg_vec_description *sav_desc,
-                       void *priv),
+               side_tracer_callback_func call,
                void *priv)
 {
        if (desc->flags & SIDE_EVENT_FLAG_VARIADIC)
                return SIDE_ERROR_INVAL;
-       return _side_tracer_callback_unregister(desc, call, priv);
+       return _side_tracer_callback_unregister(desc, (void *) call, priv);
 }
 
 int side_tracer_callback_variadic_unregister(struct side_event_description *desc,
-               void (*call_variadic)(const struct side_event_description *desc,
-                       const struct side_arg_vec_description *sav_desc,
-                       const struct side_arg_dynamic_event_struct *var_struct,
-                       void *priv),
+               side_tracer_callback_variadic_func call_variadic,
                void *priv)
 {
        if (!(desc->flags & SIDE_EVENT_FLAG_VARIADIC))
                return SIDE_ERROR_INVAL;
-       return _side_tracer_callback_unregister(desc, call_variadic, priv);
+       return _side_tracer_callback_unregister(desc, (void *) call_variadic, priv);
 }
 
 struct side_events_register_handle *side_events_register(struct side_event_description **events, uint32_t nr_events)
@@ -285,7 +282,8 @@ struct side_events_register_handle *side_events_register(struct side_event_descr
                return NULL;
        if (!initialized)
                side_init();
-       events_handle = calloc(1, sizeof(struct side_events_register_handle));
+       events_handle = (struct side_events_register_handle *)
+                       calloc(1, sizeof(struct side_events_register_handle));
        if (!events_handle)
                return NULL;
        events_handle->events = events;
@@ -305,20 +303,21 @@ struct side_events_register_handle *side_events_register(struct side_event_descr
 static
 void side_event_remove_callbacks(struct side_event_description *desc)
 {
-       uint32_t nr_cb = desc->nr_callbacks;
+       struct side_event_state *event_state = side_ptr_get(desc->state);
+       uint32_t nr_cb = event_state->nr_callbacks;
        struct side_callback *old_cb;
 
        if (!nr_cb)
                return;
-       old_cb = (struct side_callback *) desc->callbacks;
-       (void) __atomic_add_fetch(desc->enabled, -1, __ATOMIC_RELAXED);
+       old_cb = (struct side_callback *) event_state->callbacks;
+       (void) __atomic_add_fetch(&event_state->enabled, -1, __ATOMIC_RELAXED);
        /*
         * Setting the state back to 0 cb and empty callbacks out of
         * caution. This should not matter because instrumentation is
         * unreachable.
         */
-       desc->nr_callbacks = 0;
-       side_rcu_assign_pointer(desc->callbacks, &side_empty_callback);
+       event_state->nr_callbacks = 0;
+       side_rcu_assign_pointer(event_state->callbacks, &side_empty_callback);
        /*
         * No need to wait for grace period because instrumentation is
         * unreachable.
@@ -373,7 +372,8 @@ struct side_tracer_handle *side_tracer_event_notification_register(
                return NULL;
        if (!initialized)
                side_init();
-       tracer_handle = calloc(1, sizeof(struct side_tracer_handle));
+       tracer_handle = (struct side_tracer_handle *)
+                               calloc(1, sizeof(struct side_tracer_handle));
        if (!tracer_handle)
                return NULL;
        pthread_mutex_lock(&side_lock);
@@ -404,6 +404,7 @@ void side_tracer_event_notification_unregister(struct side_tracer_handle *tracer
        }
        side_list_remove_node(&tracer_handle->node);
        pthread_mutex_unlock(&side_lock);
+       free(tracer_handle);
 }
 
 void side_init(void)
This page took 0.027849 seconds and 4 git commands to generate.