X-Git-Url: http://git.lttng.org/?p=lttng-ust.git;a=blobdiff_plain;f=libringbuffer%2Fshm_types.h;h=a311f1cdd0adf7aea3fcbb8cfd6f1cd7eb47c1a5;hp=10fb1ae005402d5e256b9b1d5bb8cf0480ec2049;hb=bf5ff35ed0a3a7f60e92d654a5b97e73b94da852;hpb=7a7849896a95db678d916ccb7c5d91371828e3f8 diff --git a/libringbuffer/shm_types.h b/libringbuffer/shm_types.h index 10fb1ae0..a311f1cd 100644 --- a/libringbuffer/shm_types.h +++ b/libringbuffer/shm_types.h @@ -4,9 +4,21 @@ /* * libringbuffer/shm_types.h * - * Copyright 2011 (c) - Mathieu Desnoyers + * Copyright (C) 2011-2012 Mathieu Desnoyers * - * 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 */ #include @@ -15,13 +27,15 @@ struct channel; struct shm_object { - size_t index; /* within the object table */ - int shm_fd; /* shm fd */ - int wait_fd[2]; /* fd for wait/wakeup */ + size_t index; /* within the object table */ + int shm_fd; /* shm fd */ + char *shm_path; /* shm path */ + int wait_fd[2]; /* fd for wait/wakeup */ + char *wait_pipe_path; /* named pipe path for wait/wakeup */ char *memory_map; int is_shadow; size_t memory_map_size; - size_t allocated_len; + uint64_t allocated_len; }; struct shm_object_table {