From c000249ad5443ef852cf29506c8133d2842e6e45 Mon Sep 17 00:00:00 2001 From: Thulinma Date: Sun, 12 Apr 2015 15:31:52 +0200 Subject: [PATCH] Improved shared memory namings to no longer use the '#' character, added cmake-related files to .gitignore --- .gitignore | 7 +++++++ lib/defines.h | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ab4c02f4..39729354 100644 --- a/.gitignore +++ b/.gitignore @@ -43,4 +43,11 @@ server.html* .sync *.pc *.swp +Makefile +CMakeFiles +mist +*.cmake +Doxyfile +CMakeCache.txt +DartConfiguration.tcl diff --git a/lib/defines.h b/lib/defines.h index 6a3863f3..0fcca3ec 100644 --- a/lib/defines.h +++ b/lib/defines.h @@ -69,9 +69,9 @@ static const char * DBG_LVL_LIST[] = {"NONE", "FAIL", "ERROR", "WARN", "INFO", " #define FLIP_DATA_PAGE_SIZE 8 * 1024 * 1024 #define SHM_STREAM_INDEX "MstSTRM%s" //%s stream name -#define SHM_TRACK_META "MstTRAK%s#%lu" //%s stream name, %lu track ID -#define SHM_TRACK_INDEX "MstTRID%s#%lu" //%s stream name, %lu track ID -#define SHM_TRACK_DATA "MstDATA%s#%lu@%lu" //%s stream name, %lu track ID, %lu page # +#define SHM_TRACK_META "MstTRAK%s@%lu" //%s stream name, %lu track ID +#define SHM_TRACK_INDEX "MstTRID%s@%lu" //%s stream name, %lu track ID +#define SHM_TRACK_DATA "MstDATA%s@%lu+%lu" //%s stream name, %lu track ID, %lu page # #define SHM_STATISTICS "MstSTAT" #define SHM_USERS "MstUSER%s" //%s stream name #define SEM_LIVE "MstLIVE%s" //%s stream name