#include <lttng/ust-abi.h>
#include <lttng/usterr-signal-safe.h>
#include <lttng/ust-comm.h>
+#include <lttng/ust-events.h>
+#include <sys/mman.h>
#include "../libringbuffer/backend.h"
#include "../libringbuffer/frontend.h"
struct lttng_ust_shm_handle *handle;
struct channel *chan;
size_t chan_size;
+ struct lttng_ust_lib_ring_buffer_config *config;
+ int ret;
handle = channel_handle_create(chan_data->shm_fd,
chan_data->wait_fd,
memcpy(handle->shadow_chan, chan, chan_size);
/*
* The callback pointers in the producer are invalid in the
- * consumer. Zero them out.
+ * consumer. We need to look them up here.
*/
- memset(&handle->shadow_chan->backend.config.cb, 0,
- sizeof(handle->shadow_chan->backend.config.cb));
+ config = &handle->shadow_chan->backend.config;
+ switch (config->client_type) {
+ case LTTNG_CLIENT_METADATA:
+ memcpy(&config->cb, lttng_client_callbacks_metadata,
+ sizeof(config->cb));
+ break;
+ case LTTNG_CLIENT_DISCARD:
+ memcpy(&config->cb, lttng_client_callbacks_discard,
+ sizeof(config->cb));
+ break;
+ case LTTNG_CLIENT_OVERWRITE:
+ memcpy(&config->cb, lttng_client_callbacks_overwrite,
+ sizeof(config->cb));
+ break;
+ default:
+ ERR("Unknown client type %d", config->client_type);
+ channel_destroy(chan, handle, 1);
+ return NULL;
+ }
+ /* Replace the object table pointer. */
+ ret = munmap(handle->table->objects[0].memory_map,
+ handle->table->objects[0].memory_map_size);
+ if (ret) {
+ perror("munmap");
+ assert(0);
+ }
+ handle->table->objects[0].memory_map = (char *) handle->shadow_chan;
+ handle->table->objects[0].is_shadow = 1;
return handle;
}
return 0;
}
-int ustctl_flush_buffer(struct lttng_ust_shm_handle *handle,
+void ustctl_flush_buffer(struct lttng_ust_shm_handle *handle,
struct lttng_ust_lib_ring_buffer *buf,
int producer_active)
{
lib_ring_buffer_switch_slow(buf,
producer_active ? SWITCH_ACTIVE : SWITCH_FLUSH,
handle);
- return 0;
}