move libkcompat inside ust

[ust.git] / libust / buffers.h

diff --git a/libust/buffers.h b/libust/buffers.h
index 90ca5d92f99f7b0166393701d5c7d6233e74e8ae..d3267e102ca5e56a8b6da731ce778790d002f3f7 100644 (file)
--- a/libust/buffers.h
+++ b/libust/buffers.h
@@ -1,23 +1,37 @@
 /*
  * buffers.h
+ * LTTng userspace tracer buffering system
  *
  * Copyright (C) 2009 - Pierre-Marc Fournier (pierre-marc dot fournier at polymtl dot ca)
  * Copyright (C) 2008 - Mathieu Desnoyers (mathieu.desnoyers@polymtl.ca)
  *
+ * 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 _UST_BUFFERS_H
 #define _UST_BUFFERS_H
 
-#include <kcompat/kref.h>
 #include <assert.h>
+#include <ust/kernelcompat.h>
+#include "usterr.h"
 #include "channels.h"
 #include "tracerconst.h"
 #include "tracercore.h"
 #include "header-inline.h"
-#include <usterr.h>
 
-/***** SHOULD BE REMOVED ***** */
+/***** FIXME: SHOULD BE REMOVED ***** */
 
 /*
  * BUFFER_TRUNC zeroes the subbuffer offset and the subbuffer number parts of
@@ -519,7 +533,9 @@ static __inline__ int ust_buffers_write(struct ust_buffer *buf, size_t offset,
        return len;
 }
 
-int ust_buffers_get_subbuf(struct ust_buffer *buf, long *consumed);
-int ust_buffers_put_subbuf(struct ust_buffer *buf, unsigned long uconsumed_old);
+extern int ust_buffers_get_subbuf(struct ust_buffer *buf, long *consumed);
+extern int ust_buffers_put_subbuf(struct ust_buffer *buf, unsigned long uconsumed_old);
+
+extern void init_ustrelay_transport(void);
 
 #endif /* _UST_BUFFERS_H */