Overview
Comment: | Use an environment variable to control debug logging at runtime |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: | 2374e0de64652899c7dfde27cc3b33225640ccb3 |
User & Date: | rkeene on 2020-05-15 01:25:49 |
Other Links: | manifest | tags |
Context
2020-06-28
| ||
02:42 | Added basic QEMU demo check-in: a39441abc1 user: rkeene tags: trunk | |
2020-05-15
| ||
01:25 | Use an environment variable to control debug logging at runtime check-in: 2374e0de64 user: rkeene tags: trunk | |
2020-05-12
| ||
18:10 | Added script to do post-release upload to Fossil check-in: fbe84a64fb user: rkeene tags: trunk | |
Changes
Modified Makefile from [ac8f648957] to [bc273ac36f].
1 2 3 4 5 6 7 8 9 10 11 12 |
APPFS_VERSION = 1.14
CC = gcc
PKG_CONFIG = pkg-config
FUSE_CFLAGS = $(shell $(PKG_CONFIG) --cflags fuse)
CFLAGS_DEBUG = -Wall -g3 -ggdb3 -DDEBUG=1 -UNDEBUG -O0 -DAPPFS_EXIT_PATH=1 -DAPPFS_DEBUG_FD=stderr
CFLAGS_RELEASE = -Wall -UDEBUG -DNDEBUG=1 -O3
ifneq ($(APPFS_DEBUG_BUILD),1)
CFLAGS += $(FUSE_CFLAGS) $(TCL_CFLAGS) $(CFLAGS_RELEASE)
else
CFLAGS += $(FUSE_CFLAGS) $(TCL_CFLAGS) $(CFLAGS_DEBUG)
endif
LDFLAGS += $(TCL_LDFLAGS)
|
| |
1 2 3 4 5 6 7 8 9 10 11 12 |
APPFS_VERSION = 1.14 CC = gcc PKG_CONFIG = pkg-config FUSE_CFLAGS = $(shell $(PKG_CONFIG) --cflags fuse) CFLAGS_DEBUG = -Wall -g3 -ggdb3 -DDEBUG=1 -UNDEBUG -O0 -DAPPFS_EXIT_PATH=1 CFLAGS_RELEASE = -Wall -UDEBUG -DNDEBUG=1 -O3 ifneq ($(APPFS_DEBUG_BUILD),1) CFLAGS += $(FUSE_CFLAGS) $(TCL_CFLAGS) $(CFLAGS_RELEASE) else CFLAGS += $(FUSE_CFLAGS) $(TCL_CFLAGS) $(CFLAGS_DEBUG) endif LDFLAGS += $(TCL_LDFLAGS) |
Modified appfsd.c from [b81dc3008d] to [4ff2357fbb].
43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 |
#ifndef APPFS_CACHEDIR #define APPFS_CACHEDIR "/var/cache/appfs" #endif /* Debugging macros */ #ifdef DEBUG FILE *appfs_debug_fd = NULL; #ifndef APPFS_DEBUG_FD # ifdef APPFS_DEBUG_FILE # define APPFS_DEBUG_FD fopen(APPFS_DEBUG_FILE, "a") # else # define APPFS_DEBUG_FD fopen("/tmp/appfsd.log", "a") # endif #endif #define APPFS_DEBUG(x...) { \ char buf[8192]; \ int bufoff = 0; \ if (appfs_debug_fd == NULL) { \ appfs_debug_fd = APPFS_DEBUG_FD; \ }; \ if (appfs_debug_fd == NULL) { appfs_debug_fd = stderr; } \ bufoff = snprintf(buf, sizeof(buf), "[debug] [t=%llx] %s:%i:%s: ", (unsigned long long) pthread_self(), __FILE__, __LINE__, __func__); \ if (bufoff < sizeof(buf)) { \ bufoff += snprintf(buf + bufoff, sizeof(buf) - bufoff, x); \ }; \ if (bufoff < sizeof(buf)) { \ |
< < < < < < < < < > > > > > > | > > > |
43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 |
#ifndef APPFS_CACHEDIR #define APPFS_CACHEDIR "/var/cache/appfs" #endif /* Debugging macros */ #ifdef DEBUG FILE *appfs_debug_fd = NULL; #define APPFS_DEBUG(x...) { \ char buf[8192]; \ int bufoff = 0; \ char *appfs_debug_file = NULL; \ if (appfs_debug_fd == NULL) { \ appfs_debug_file = getenv("APPFS_DEBUG_FILE"); \ if (appfs_debug_file == NULL) { \ appfs_debug_file = "stderr"; \ }; \ if (strcmp(appfs_debug_file, "stderr") == 0) { \ appfs_debug_fd = stderr; \ } else { \ appfs_debug_fd = fopen(appfs_debug_file, "a"); \ }; \ }; \ if (appfs_debug_fd == NULL) { appfs_debug_fd = stderr; } \ bufoff = snprintf(buf, sizeof(buf), "[debug] [t=%llx] %s:%i:%s: ", (unsigned long long) pthread_self(), __FILE__, __LINE__, __func__); \ if (bufoff < sizeof(buf)) { \ bufoff += snprintf(buf + bufoff, sizeof(buf) - bufoff, x); \ }; \ if (bufoff < sizeof(buf)) { \ |