X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libringbuffer%2Fring_buffer_backend.c;h=e7a00144544a9d3e10b502cbdef0bececc990f5b;hb=019fbcb65ec7eec2c86019ad1afce8fa47dc1269;hp=95346049f5b20f9f92d0cd9e3875b4a76e84b54b;hpb=35897f8b2d311b756b81657dad9c53ef1c0fad8a;p=lttng-ust.git

diff --git a/libringbuffer/ring_buffer_backend.c b/libringbuffer/ring_buffer_backend.c
index 95346049..e7a00144 100644
--- a/libringbuffer/ring_buffer_backend.c
+++ b/libringbuffer/ring_buffer_backend.c
@@ -1,12 +1,26 @@
 /*
  * ring_buffer_backend.c
  *
- * Copyright (C) 2005-2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2005-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * Dual LGPL v2.1/GPL v2 license.
+ * 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
  */
 
+#define _GNU_SOURCE
 #include <urcu/arch.h>
+#include <limits.h>
 
 #include <lttng/ringbuffer-config.h>
 #include "vatomic.h"
@@ -208,18 +222,18 @@ int channel_backend_init(struct channel_backend *chanb,
 	if (!name)
 		return -EPERM;
 
-	if (!(subbuf_size && num_subbuf))
-		return -EPERM;
-
 	/* Check that the subbuffer size is larger than a page. */
 	if (subbuf_size < PAGE_SIZE)
 		return -EINVAL;
 
 	/*
-	 * Make sure the number of subbuffers and subbuffer size are power of 2.
+	 * Make sure the number of subbuffers and subbuffer size are
+	 * power of 2, and nonzero.
 	 */
-	CHAN_WARN_ON(chanb, hweight32(subbuf_size) != 1);
-	CHAN_WARN_ON(chanb, hweight32(num_subbuf) != 1);
+	if (!subbuf_size || (subbuf_size & (subbuf_size - 1)))
+		return -EINVAL;
+	if (!num_subbuf || (num_subbuf & (num_subbuf - 1)))
+		return -EINVAL;
 
 	ret = subbuffer_id_check_index(config, num_subbuf);
 	if (ret)
@@ -266,7 +280,8 @@ int channel_backend_init(struct channel_backend *chanb,
 		for_each_possible_cpu(i) {
 			struct shm_object *shmobj;
 
-			shmobj = shm_object_table_append(handle->table, shmsize);
+			shmobj = shm_object_table_alloc(handle->table, shmsize,
+					SHM_OBJECT_SHM);
 			if (!shmobj)
 				goto end;
 			align_shm(shmobj, __alignof__(struct lttng_ust_lib_ring_buffer));
@@ -284,7 +299,8 @@ int channel_backend_init(struct channel_backend *chanb,
 		struct shm_object *shmobj;
 		struct lttng_ust_lib_ring_buffer *buf;
 
-		shmobj = shm_object_table_append(handle->table, shmsize);
+		shmobj = shm_object_table_alloc(handle->table, shmsize,
+					SHM_OBJECT_SHM);
 		if (!shmobj)
 			goto end;
 		align_shm(shmobj, __alignof__(struct lttng_ust_lib_ring_buffer));
@@ -292,6 +308,7 @@ int channel_backend_init(struct channel_backend *chanb,
 		buf = shmp(handle, chanb->buf[0].shmp);
 		if (!buf)
 			goto end;
+		set_shmp(buf->self, chanb->buf[0].shmp._ref);
 		ret = lib_ring_buffer_create(buf, chanb, -1,
 					handle, shmobj);
 		if (ret)