X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libust%2Ftracer.h;h=c680973953b05e6137b453b8cefc0bd54d52a19b;hb=772030fed323e388da467735cf4b5e8781acb710;hp=70d1c10d7851a2988bb3c7a465668e29b6efc2cc;hpb=8431032f4fc1ce2c758568e27685a3e46265a745;p=lttng-ust.git

diff --git a/libust/tracer.h b/libust/tracer.h
index 70d1c10d..c6809739 100644
--- a/libust/tracer.h
+++ b/libust/tracer.h
@@ -6,7 +6,19 @@
  *
  * Ported to userspace by Pierre-Marc Fournier.
  *
- * This file is released under the GPLv2.
+ * 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; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * 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
  */
 
 #ifndef _LTT_TRACER_H
@@ -14,9 +26,10 @@
 
 #include <sys/types.h>
 #include <stdarg.h>
-#include "relay.h"
-#include "list.h"
+//#include "list.h"
 #include "kernelcompat.h"
+#include "buffer.h"
+#include "relay.h"
 #include "channels.h"
 #include "tracercore.h"
 #include "marker.h"
@@ -430,23 +443,6 @@ static inline size_t ltt_write_event_header(struct ltt_trace_struct *trace,
 
 /* Lockless LTTng */
 
-/* Buffer offset macros */
-
-/*
- * BUFFER_TRUNC zeroes the subbuffer offset and the subbuffer number parts of
- * the offset, which leaves only the buffer number.
- */
-#define BUFFER_TRUNC(offset, chan) \
-	((offset) & (~((chan)->alloc_size-1)))
-#define BUFFER_OFFSET(offset, chan) ((offset) & ((chan)->alloc_size - 1))
-#define SUBBUF_OFFSET(offset, chan) ((offset) & ((chan)->subbuf_size - 1))
-#define SUBBUF_ALIGN(offset, chan) \
-	(((offset) + (chan)->subbuf_size) & (~((chan)->subbuf_size - 1)))
-#define SUBBUF_TRUNC(offset, chan) \
-	((offset) & (~((chan)->subbuf_size - 1)))
-#define SUBBUF_INDEX(offset, chan) \
-	(BUFFER_OFFSET((offset), chan) >> (chan)->subbuf_size_order)
-
 /*
  * ltt_reserve_slot
  *
@@ -524,14 +520,17 @@ static inline int ltt_reserve_slot(
 #define LTT_FLIGHT_PREFIX	"flight-"
 
 /* Tracer properties */
-//#define LTT_DEFAULT_SUBBUF_SIZE_LOW	65536
-#define LTT_DEFAULT_SUBBUF_SIZE_LOW	4096
+//#define LTT_DEFAULT_SUBBUF_SIZE_LOW	134217728
+#define LTT_DEFAULT_SUBBUF_SIZE_LOW	65536
+//#define LTT_DEFAULT_SUBBUF_SIZE_LOW	4096
 #define LTT_DEFAULT_N_SUBBUFS_LOW	2
-//#define LTT_DEFAULT_SUBBUF_SIZE_MED	262144
-#define LTT_DEFAULT_SUBBUF_SIZE_MED	4096
+//#define LTT_DEFAULT_SUBBUF_SIZE_MED	134217728
+#define LTT_DEFAULT_SUBBUF_SIZE_MED	262144
+//#define LTT_DEFAULT_SUBBUF_SIZE_MED	4096
 #define LTT_DEFAULT_N_SUBBUFS_MED	2
-//#define LTT_DEFAULT_SUBBUF_SIZE_HIGH	1048576
-#define LTT_DEFAULT_SUBBUF_SIZE_HIGH	4096	
+//#define LTT_DEFAULT_SUBBUF_SIZE_HIGH	134217728
+#define LTT_DEFAULT_SUBBUF_SIZE_HIGH	1048576
+//#define LTT_DEFAULT_SUBBUF_SIZE_HIGH	4096
 #define LTT_DEFAULT_N_SUBBUFS_HIGH	2
 #define LTT_TRACER_MAGIC_NUMBER		0x00D6B7ED
 #define LTT_TRACER_VERSION_MAJOR	2