Skip to content

Commit

Permalink
Merge pull request #126 from davidvossel/17.1.fixes
Browse files Browse the repository at this point in the history
build cleanup and thread-safe logging documentation
  • Loading branch information
davidvossel committed Jul 23, 2014
2 parents b103e1a + bd48e8f commit dbf460a
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 5 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@ compat_reports
abi_dumps
TAGS
*~
test-driver
2 changes: 1 addition & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ AUTOMAKE_OPTIONS = foreign
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure depcomp \
config.guess config.sub missing install-sh \
autoheader automake autoconf libtool libtoolize \
ltmain.sh compile
ltmain.sh compile build-aux/test-driver


ACLOCAL_AMFLAGS = -I m4
Expand Down
11 changes: 8 additions & 3 deletions include/qb/qblog.h
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,14 @@ extern "C" {
* QB_LOG_FILTER_FORMAT, "ringbuffer", LOG_TRACE);
* @endcode
*
* @par Threaded logging.
* To achieve non-blocking logging you can use threaded logging. So any
* calls to write() or syslog() will not hold up your program.
* @par Thread safe non-blocking logging.
* Logging is only thread safe when threaded logging is in use. If you plan
* on logging from multiple threads, you must initialize libqb's logger thread
* and use qg_log_filter_ctl to set the QB_LOG_CONF_THREADED flag on all the
* logging targets in use.
*
* To achieve non-blocking logging you can use threaded logging as well
* So any calls to write() or syslog() will not hold up your program.
*
* Threaded logging use:
* @code
Expand Down
2 changes: 1 addition & 1 deletion lib/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ source_to_lint = util.c hdb.c ringbuffer.c ringbuffer_helper.c \
libqb_la_SOURCES = $(source_to_lint) unix.c
libqb_la_LIBADD = @LTLIBOBJS@

LDFLAGS = $(LDFLAGS_COPY:-Bsymbolic-functions=)
AM_LDFLAGS = $(LDFLAGS_COPY:-Bsymbolic-functions=)

if HAVE_SEM_TIMEDWAIT
else
Expand Down

0 comments on commit dbf460a

Please sign in to comment.