Cygwin: Pass file paths instead of file descriptors over UNIX sockets

[lttng-ust.git] / liblttng-ust / lttng-ust-abi.c

diff --git a/liblttng-ust/lttng-ust-abi.c b/liblttng-ust/lttng-ust-abi.c
index 7e7078e04602231539e3f308ec5b07d086482d71..a3edd3ead7d93343c26fd1067449f98713658cb9 100644 (file)
--- a/liblttng-ust/lttng-ust-abi.c
+++ b/liblttng-ust/lttng-ust-abi.c
@@ -1,10 +1,25 @@
 /*
  * lttng-ust-abi.c
  *
- * Copyright 2010-2011 (c) - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
  * LTTng UST ABI
  *
+ * Copyright (C) 2010-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; only
+ * version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ *
  * Mimic system calls for:
  * - session creation, returns an object descriptor or failure.
  *   - channel creation, returns an object descriptor or failure.
@@ -20,8 +35,6 @@
  *     - Takes an instrumentation source as parameter
  *       - e.g. tracepoints, dynamic_probes...
  *     - Takes instrumentation source specific arguments.
- *
- * Dual LGPL v2.1/GPL v2 license.
  */
 
 #include <lttng/ust-abi.h>
@@ -29,10 +42,11 @@
 #include <urcu/list.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-version.h>
+#include <lttng/tracepoint.h>
+#include "tracepoint-internal.h"
 #include <usterr-signal-safe.h>
 #include <helper.h>
 #include "ltt-tracer.h"
-#include "tracepoint-internal.h"
 
 static int lttng_ust_abi_close_in_progress;
 
@@ -330,6 +344,8 @@ void lttng_metadata_create_events(int channel_objd)
        static struct lttng_ust_event metadata_params = {
                .instrumentation = LTTNG_UST_TRACEPOINT,
                .name = "lttng_ust:metadata",
+               .loglevel_type = LTTNG_UST_LOGLEVEL_ALL,
+               .loglevel = TRACE_DEFAULT,
        };
        struct ltt_event *event;
        int ret;
@@ -402,7 +418,9 @@ int lttng_abi_create_channel(int session_objd,
                                  chan_param->switch_timer_interval,
                                  chan_param->read_timer_interval,
                                  &uargs->channel.shm_fd,
+                                 &uargs->channel.shm_path,
                                  &uargs->channel.wait_fd,
+                                 &uargs->channel.wait_pipe_path,
                                  &uargs->channel.memory_map_size,
                                  &chan_priv_init);
        if (!chan) {
@@ -601,9 +619,9 @@ int lttng_abi_open_stream(int channel_objd, struct lttng_ust_stream *info,
        int stream_objd, ret;
 
        buf = channel->ops->buffer_read_open(channel->chan, channel->handle,
-                       &uargs->stream.shm_fd,
-                       &uargs->stream.wait_fd,
-                       &uargs->stream.memory_map_size);
+                    &uargs->stream.shm_fd, &uargs->stream.shm_path,
+                    &uargs->stream.wait_fd, &uargs->stream.wait_pipe_path,
+                    &uargs->stream.memory_map_size);
        if (!buf)
                return -ENOENT;