X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=libringbuffer%2Fbackend.h;h=feefc7a3229f1314cf6813b1f05178a0cc6176e8;hb=refs%2Fheads%2Fstable-2.0;hp=69c47ab69642d8ea3c8e0ba941423c09f7680b96;hpb=4318ae1be57eb7983ab4857a7a8eeb4a030a8216;p=lttng-ust.git diff --git a/libringbuffer/backend.h b/libringbuffer/backend.h index 69c47ab6..feefc7a3 100644 --- a/libringbuffer/backend.h +++ b/libringbuffer/backend.h @@ -1,14 +1,26 @@ -#ifndef _LINUX_RING_BUFFER_BACKEND_H -#define _LINUX_RING_BUFFER_BACKEND_H +#ifndef _LTTNG_RING_BUFFER_BACKEND_H +#define _LTTNG_RING_BUFFER_BACKEND_H /* - * linux/ringbuffer/backend.h - * - * Copyright (C) 2008-2010 - Mathieu Desnoyers + * libringbuffer/backend.h * * Ring buffer backend (API). * - * Dual LGPL v2.1/GPL v2 license. + * Copyright (C) 2011-2012 Mathieu Desnoyers + * + * 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 * * Credits to Steven Rostedt for proposing to use an extra-subbuffer owned by * the reader in flight recorder mode. @@ -16,8 +28,6 @@ #include -#include "lttng/core.h" - /* Internal helpers */ #include "backend_internal.h" #include "frontend_internal.h" @@ -74,6 +84,8 @@ void lib_ring_buffer_write(const struct lttng_ust_lib_ring_buffer_config *config struct lttng_ust_lib_ring_buffer_backend_pages_shmp *rpages; unsigned long sb_bindex, id; + if (caa_unlikely(!len)) + return; offset &= chanb->buf_size - 1; sbidx = offset >> chanb->subbuf_size_order; id = shmp_index(handle, bufb->buf_wsb, sbidx)->id; @@ -124,4 +136,4 @@ unsigned long lib_ring_buffer_get_records_unread( return records_unread; } -#endif /* _LINUX_RING_BUFFER_BACKEND_H */ +#endif /* _LTTNG_RING_BUFFER_BACKEND_H */