mirror of
https://github.com/gflags/gflags.git
synced 2025-04-05 21:45:04 +00:00
Thu Sep 10 12:53:04 2009 Google Inc. <opensource@google.com>
* google-gflags: version 1.2 * PORTABILITY: can now build and run tests under mingw (csilvers) * Using a string arg for a bool flag is a compile-time error (rbayardo) * Add --helpxml to gflags.py (salcianu) * Protect against a hypothetical global d'tor mutex problem (csilvers) * BUGFIX: can now define a flag after 'using namespace google' (hamaji) git-svn-id: https://gflags.googlecode.com/svn/trunk@32 6586e3c6-dcc4-952a-343f-ff74eb82781d
This commit is contained in:
Craig Silverstein
parent
de718176a2
commit
688ea02a69
18 changed files with 1746 additions and 639 deletions
|
|
@ -1,3 +1,12 @@
|
|||
Thu Sep 10 12:53:04 2009 Google Inc. <opensource@google.com>
|
||||
|
||||
* google-gflags: version 1.2
|
||||
* PORTABILITY: can now build and run tests under mingw (csilvers)
|
||||
* Using a string arg for a bool flag is a compile-time error (rbayardo)
|
||||
* Add --helpxml to gflags.py (salcianu)
|
||||
* Protect against a hypothetical global d'tor mutex problem (csilvers)
|
||||
* BUGFIX: can now define a flag after 'using namespace google' (hamaji)
|
||||
|
||||
Tue Apr 14 12:35:25 2009 Google Inc. <opensource@google.com>
|
||||
|
||||
* google-gflags: version 1.1
|
||||
|
|
|
|||
35
Makefile.am
35
Makefile.am
|
|
@ -67,7 +67,7 @@ lib_LTLIBRARIES += libgflags_nothreads.la
|
|||
libgflags_nothreads_la_SOURCES = $(GFLAGS_SOURCES)
|
||||
libgflags_nothreads_la_CXXFLAGS = -DNDEBUG -DNO_THREADS
|
||||
|
||||
TESTS += gflags_unittest$(EXEEXT)
|
||||
TESTS += gflags_unittest
|
||||
gflags_unittest_SOURCES = $(gflagsinclude_HEADERS) src/config.h \
|
||||
src/gflags_unittest.cc
|
||||
gflags_unittest_CXXFLAGS = $(PTHREAD_CFLAGS)
|
||||
|
|
@ -75,14 +75,14 @@ gflags_unittest_LDFLAGS = $(PTHREAD_CFLAGS)
|
|||
gflags_unittest_LDADD = libgflags.la
|
||||
|
||||
# Also make sure this works when we don't link in pthreads
|
||||
TESTS += gflags_nothreads_unittest$(EXEEXT)
|
||||
TESTS += gflags_nothreads_unittest
|
||||
gflags_nothreads_unittest_SOURCES = $(gflags_unittest_SOURCES)
|
||||
gflags_nothreads_unittest_LDADD = libgflags_nothreads.la
|
||||
|
||||
# We also want to test that things work properly when the file that
|
||||
# holds main() has a name ending with -main or _main. To keep the
|
||||
# Makefile small :-), we test the no-threads version of these.
|
||||
TESTS += gflags_unittest2$(EXEEXT)
|
||||
TESTS += gflags_unittest2
|
||||
gflags_unittest2_SOURCES = $(gflagsinclude_HEADERS) src/config.h \
|
||||
src/gflags_unittest-main.cc
|
||||
gflags_unittest2_LDADD = libgflags_nothreads.la
|
||||
|
|
@ -91,7 +91,7 @@ src/gflags_unittest-main.cc: src/gflags_unittest.cc
|
|||
cp -p src/gflags_unittest.cc src/gflags_unittest-main.cc
|
||||
CLEANFILES += src/gflags_unittest-main.cc
|
||||
|
||||
TESTS += gflags_unittest3$(EXEEXT)
|
||||
TESTS += gflags_unittest3
|
||||
gflags_unittest3_SOURCES = $(gflagsinclude_HEADERS) src/config.h \
|
||||
src/gflags_unittest_main.cc
|
||||
gflags_unittest3_LDADD = libgflags_nothreads.la
|
||||
|
|
@ -109,9 +109,32 @@ dist_noinst_DATA = src/gflags_unittest_flagfile
|
|||
gflags_unittest_sh: gflags_unittest$(EXEEXT) \
|
||||
gflags_unittest2$(EXEEXT) \
|
||||
gflags_unittest3$(EXEEXT)
|
||||
bash --version >/dev/null && export SH=bash || export SH=sh; \
|
||||
bash --version >/dev/null 2>&1 && export SH=bash || export SH=sh; \
|
||||
$$SH "$(top_srcdir)/src/gflags_unittest.sh" "$(PWD)/gflags_unittest" \
|
||||
"$(top_srcdir)"
|
||||
"$(top_srcdir)" "@TMPDIR@"
|
||||
|
||||
# These are negative-compilation tests. We want to make sure these
|
||||
# erroneous use of the flags macros correctly fail to compile.
|
||||
# Again, we just bother testing with the no-threads version of the library.
|
||||
check_SCRIPTS += gflags_nc_test1
|
||||
gflags_nc_test1: $(gflagsinclude_HEADERS) src/config.h src/gflags_nc.cc
|
||||
! $(CXX) -DTEST_SWAPPED_ARGS $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gflags_nc_test1.o $(srcdir)/src/gflags_nc.cc && echo "Compile failed, like it was supposed to"
|
||||
|
||||
check_SCRIPTS += gflags_nc_test2
|
||||
gflags_nc_test2: $(gflagsinclude_HEADERS) src/config.h src/gflags_nc.cc
|
||||
! $(CXX) -DTEST_INT_INSTEAD_OF_BOOL $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gflags_nc_test2.o $(srcdir)/src/gflags_nc.cc && echo "Compile failed, like it was supposed to"
|
||||
|
||||
check_SCRIPTS += gflags_nc_test3
|
||||
gflags_nc_test3: $(gflagsinclude_HEADERS) src/config.h src/gflags_nc.cc
|
||||
! $(CXX) -DTEST_BOOL_IN_QUOTES $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gflags_nc_test3.o $(srcdir)/src/gflags_nc.cc && echo "Compile failed, like it was supposed to"
|
||||
|
||||
# This one, on the other hand, should succeed.
|
||||
check_SCRIPTS += gflags_nc_test4
|
||||
gflags_nc_test4: $(gflagsinclude_HEADERS) src/config.h src/gflags_nc.cc
|
||||
$(CXX) -DSANITY $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gflags_nc_test4.o $(srcdir)/src/gflags_nc.cc && echo "Compile failed, like it was supposed to"
|
||||
|
||||
# This file isn't covered under any rule that would cause it to be distributed.
|
||||
dist_noinst_DATA += src/gflags_nc.cc
|
||||
|
||||
# These aren't part of the c++ source, but we want them to be distributed
|
||||
PYTHON = python/setup.py \
|
||||
|
|
|
|||
35
Makefile.in
35
Makefile.in
|
|
@ -158,7 +158,7 @@ am__remove_distdir = \
|
|||
{ test ! -d $(distdir) \
|
||||
|| { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
|
||||
&& rm -fr $(distdir); }; }
|
||||
DIST_ARCHIVES = $(distdir).tar.gz
|
||||
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).zip
|
||||
GZIP_ENV = --best
|
||||
distuninstallcheck_listfiles = find . -type f -print
|
||||
distcleancheck_listfiles = find . -type f -print
|
||||
|
|
@ -225,6 +225,7 @@ SED = @SED@
|
|||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
STRIP = @STRIP@
|
||||
TMPDIR = @TMPDIR@
|
||||
VERSION = @VERSION@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
ac_ct_CXX = @ac_ct_CXX@
|
||||
|
|
@ -314,14 +315,21 @@ lib_LTLIBRARIES = libgflags.la libgflags_nothreads.la
|
|||
# We also want to test that things work properly when the file that
|
||||
# holds main() has a name ending with -main or _main. To keep the
|
||||
# Makefile small :-), we test the no-threads version of these.
|
||||
TESTS = gflags_unittest$(EXEEXT) gflags_nothreads_unittest$(EXEEXT) \
|
||||
gflags_unittest2$(EXEEXT) gflags_unittest3$(EXEEXT)
|
||||
TESTS = gflags_unittest gflags_nothreads_unittest gflags_unittest2 \
|
||||
gflags_unittest3
|
||||
TESTS_ENVIRONMENT = SRCDIR="$(top_srcdir)"
|
||||
|
||||
# Some buggy sh's ignore "" instead of treating it as a positional
|
||||
# parameter. Since we use "" in this script, we prefer bash if we
|
||||
# can. If there's no bash, we fall back to sh.
|
||||
check_SCRIPTS = gflags_unittest_sh
|
||||
|
||||
# These are negative-compilation tests. We want to make sure these
|
||||
# erroneous use of the flags macros correctly fail to compile.
|
||||
# Again, we just bother testing with the no-threads version of the library.
|
||||
|
||||
# This one, on the other hand, should succeed.
|
||||
check_SCRIPTS = gflags_unittest_sh gflags_nc_test1 gflags_nc_test2 \
|
||||
gflags_nc_test3 gflags_nc_test4
|
||||
# Every time you add a unittest to check_SCRIPTS, add it here too
|
||||
noinst_SCRIPTS = src/gflags_unittest.sh
|
||||
# Used for auto-generated source files
|
||||
|
|
@ -352,7 +360,9 @@ gflags_unittest3_SOURCES = $(gflagsinclude_HEADERS) src/config.h \
|
|||
src/gflags_unittest_main.cc
|
||||
|
||||
gflags_unittest3_LDADD = libgflags_nothreads.la
|
||||
dist_noinst_DATA = src/gflags_unittest_flagfile
|
||||
|
||||
# This file isn't covered under any rule that would cause it to be distributed.
|
||||
dist_noinst_DATA = src/gflags_unittest_flagfile src/gflags_nc.cc
|
||||
|
||||
# These aren't part of the c++ source, but we want them to be distributed
|
||||
PYTHON = python/setup.py \
|
||||
|
|
@ -862,7 +872,6 @@ dist-tarZ: distdir
|
|||
dist-shar: distdir
|
||||
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
|
||||
$(am__remove_distdir)
|
||||
|
||||
dist-zip: distdir
|
||||
-rm -f $(distdir).zip
|
||||
zip -rq $(distdir).zip $(distdir)
|
||||
|
|
@ -870,6 +879,8 @@ dist-zip: distdir
|
|||
|
||||
dist dist-all: distdir
|
||||
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
|
||||
-rm -f $(distdir).zip
|
||||
zip -rq $(distdir).zip $(distdir)
|
||||
$(am__remove_distdir)
|
||||
|
||||
# This target untars the dist file and tries a VPATH configuration. Then
|
||||
|
|
@ -1060,9 +1071,17 @@ src/gflags_unittest_main.cc: src/gflags_unittest.cc
|
|||
gflags_unittest_sh: gflags_unittest$(EXEEXT) \
|
||||
gflags_unittest2$(EXEEXT) \
|
||||
gflags_unittest3$(EXEEXT)
|
||||
bash --version >/dev/null && export SH=bash || export SH=sh; \
|
||||
bash --version >/dev/null 2>&1 && export SH=bash || export SH=sh; \
|
||||
$$SH "$(top_srcdir)/src/gflags_unittest.sh" "$(PWD)/gflags_unittest" \
|
||||
"$(top_srcdir)"
|
||||
"$(top_srcdir)" "@TMPDIR@"
|
||||
gflags_nc_test1: $(gflagsinclude_HEADERS) src/config.h src/gflags_nc.cc
|
||||
! $(CXX) -DTEST_SWAPPED_ARGS $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gflags_nc_test1.o $(srcdir)/src/gflags_nc.cc && echo "Compile failed, like it was supposed to"
|
||||
gflags_nc_test2: $(gflagsinclude_HEADERS) src/config.h src/gflags_nc.cc
|
||||
! $(CXX) -DTEST_INT_INSTEAD_OF_BOOL $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gflags_nc_test2.o $(srcdir)/src/gflags_nc.cc && echo "Compile failed, like it was supposed to"
|
||||
gflags_nc_test3: $(gflagsinclude_HEADERS) src/config.h src/gflags_nc.cc
|
||||
! $(CXX) -DTEST_BOOL_IN_QUOTES $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gflags_nc_test3.o $(srcdir)/src/gflags_nc.cc && echo "Compile failed, like it was supposed to"
|
||||
gflags_nc_test4: $(gflagsinclude_HEADERS) src/config.h src/gflags_nc.cc
|
||||
$(CXX) -DSANITY $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gflags_nc_test4.o $(srcdir)/src/gflags_nc.cc && echo "Compile failed, like it was supposed to"
|
||||
|
||||
rpm: dist-gzip packages/rpm.sh packages/rpm/rpm.spec
|
||||
@cd packages && ./rpm.sh ${PACKAGE} ${VERSION}
|
||||
|
|
|
|||
171
configure
vendored
171
configure
vendored
|
|
@ -1,6 +1,6 @@
|
|||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.61 for gflags 1.1.
|
||||
# Generated by GNU Autoconf 2.61 for gflags 1.2.
|
||||
#
|
||||
# Report bugs to <opensource@google.com>.
|
||||
#
|
||||
|
|
@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
|
|||
# Identity of this package.
|
||||
PACKAGE_NAME='gflags'
|
||||
PACKAGE_TARNAME='gflags'
|
||||
PACKAGE_VERSION='1.1'
|
||||
PACKAGE_STRING='gflags 1.1'
|
||||
PACKAGE_VERSION='1.2'
|
||||
PACKAGE_STRING='gflags 1.2'
|
||||
PACKAGE_BUGREPORT='opensource@google.com'
|
||||
|
||||
ac_unique_file="README"
|
||||
|
|
@ -860,6 +860,7 @@ host
|
|||
host_cpu
|
||||
host_vendor
|
||||
host_os
|
||||
TMPDIR
|
||||
SED
|
||||
GREP
|
||||
EGREP
|
||||
|
|
@ -1410,7 +1411,7 @@ if test "$ac_init_help" = "long"; then
|
|||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<_ACEOF
|
||||
\`configure' configures gflags 1.1 to adapt to many kinds of systems.
|
||||
\`configure' configures gflags 1.2 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
|
|
@ -1480,7 +1481,7 @@ fi
|
|||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of gflags 1.1:";;
|
||||
short | recursive ) echo "Configuration of gflags 1.2:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
|
|
@ -1586,7 +1587,7 @@ fi
|
|||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
gflags configure 1.1
|
||||
gflags configure 1.2
|
||||
generated by GNU Autoconf 2.61
|
||||
|
||||
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
||||
|
|
@ -1600,7 +1601,7 @@ cat >config.log <<_ACEOF
|
|||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by gflags $as_me 1.1, which was
|
||||
It was created by gflags $as_me 1.2, which was
|
||||
generated by GNU Autoconf 2.61. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
|
|
@ -2273,7 +2274,7 @@ fi
|
|||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='gflags'
|
||||
VERSION='1.1'
|
||||
VERSION='1.2'
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
|
|
@ -4382,6 +4383,8 @@ fi
|
|||
|
||||
|
||||
|
||||
# /tmp is a mount-point in mingw, and hard to use. use cwd instead
|
||||
TMPDIR=gflags_testdir
|
||||
;;
|
||||
*)
|
||||
# Check whether --enable-fast-install was given.
|
||||
|
|
@ -4408,9 +4411,11 @@ else
|
|||
fi
|
||||
|
||||
|
||||
TMPDIR=/tmp/gflags
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
# Uncomment this if you'll be exporting libraries (.so's)
|
||||
# Check whether --enable-shared was given.
|
||||
if test "${enable_shared+set}" = set; then
|
||||
|
|
@ -5113,7 +5118,7 @@ ia64-*-hpux*)
|
|||
;;
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 5116 "configure"' > conftest.$ac_ext
|
||||
echo '#line 5121 "configure"' > conftest.$ac_ext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -7468,11 +7473,11 @@ else
|
|||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:7471: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:7476: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:7475: \$? = $ac_status" >&5
|
||||
echo "$as_me:7480: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
|
|
@ -7758,11 +7763,11 @@ else
|
|||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:7761: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:7766: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:7765: \$? = $ac_status" >&5
|
||||
echo "$as_me:7770: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
|
|
@ -7862,11 +7867,11 @@ else
|
|||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:7865: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:7870: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:7869: \$? = $ac_status" >&5
|
||||
echo "$as_me:7874: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
|
|
@ -10239,7 +10244,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10242 "configure"
|
||||
#line 10247 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -10339,7 +10344,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10342 "configure"
|
||||
#line 10347 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -12740,11 +12745,11 @@ else
|
|||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:12743: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:12748: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:12747: \$? = $ac_status" >&5
|
||||
echo "$as_me:12752: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
|
|
@ -12844,11 +12849,11 @@ else
|
|||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:12847: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:12852: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:12851: \$? = $ac_status" >&5
|
||||
echo "$as_me:12856: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
|
|
@ -14442,11 +14447,11 @@ else
|
|||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:14445: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:14450: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:14449: \$? = $ac_status" >&5
|
||||
echo "$as_me:14454: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
|
|
@ -14546,11 +14551,11 @@ else
|
|||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:14549: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:14554: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:14553: \$? = $ac_status" >&5
|
||||
echo "$as_me:14558: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
|
|
@ -16766,11 +16771,11 @@ else
|
|||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:16769: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:16774: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:16773: \$? = $ac_status" >&5
|
||||
echo "$as_me:16778: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
|
|
@ -17056,11 +17061,11 @@ else
|
|||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:17059: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:17064: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:17063: \$? = $ac_status" >&5
|
||||
echo "$as_me:17068: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
|
|
@ -17160,11 +17165,11 @@ else
|
|||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:17163: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:17168: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:17167: \$? = $ac_status" >&5
|
||||
echo "$as_me:17172: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
|
|
@ -20863,6 +20868,101 @@ done
|
|||
|
||||
|
||||
|
||||
for ac_func in setenv putenv
|
||||
do
|
||||
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
||||
{ echo "$as_me:$LINENO: checking for $ac_func" >&5
|
||||
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
|
||||
if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
|
||||
For example, HP-UX 11i <limits.h> declares gettimeofday. */
|
||||
#define $ac_func innocuous_$ac_func
|
||||
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func (); below.
|
||||
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
||||
<limits.h> exists even on freestanding compilers. */
|
||||
|
||||
#ifdef __STDC__
|
||||
# include <limits.h>
|
||||
#else
|
||||
# include <assert.h>
|
||||
#endif
|
||||
|
||||
#undef $ac_func
|
||||
|
||||
/* Override any GCC internal prototype to avoid an error.
|
||||
Use char because int might match the return type of a GCC
|
||||
builtin and then its argument prototype would still apply. */
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
char $ac_func ();
|
||||
/* The GNU C library defines this for functions which it implements
|
||||
to always fail with ENOSYS. Some functions are actually named
|
||||
something starting with __ and the normal name is an alias. */
|
||||
#if defined __stub_$ac_func || defined __stub___$ac_func
|
||||
choke me
|
||||
#endif
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
return $ac_func ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
if { (ac_try="$ac_link"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||||
(eval "$ac_link") 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } && {
|
||||
test -z "$ac_c_werror_flag" ||
|
||||
test ! -s conftest.err
|
||||
} && test -s conftest$ac_exeext &&
|
||||
$as_test_x conftest$ac_exeext; then
|
||||
eval "$as_ac_var=yes"
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
eval "$as_ac_var=no"
|
||||
fi
|
||||
|
||||
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
fi
|
||||
ac_res=`eval echo '${'$as_ac_var'}'`
|
||||
{ echo "$as_me:$LINENO: result: $ac_res" >&5
|
||||
echo "${ECHO_T}$ac_res" >&6; }
|
||||
if test `eval echo '${'$as_ac_var'}'` = yes; then
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
done
|
||||
# MinGW has putenv but not setenv
|
||||
|
||||
|
||||
{ echo "$as_me:$LINENO: checking for __attribute__" >&5
|
||||
echo $ECHO_N "checking for __attribute__... $ECHO_C" >&6; }
|
||||
if test "${ac_cv___attribute__+set}" = set; then
|
||||
|
|
@ -22323,7 +22423,7 @@ exec 6>&1
|
|||
# report actual input values of CONFIG_FILES etc. instead of their
|
||||
# values after options handling.
|
||||
ac_log="
|
||||
This file was extended by gflags $as_me 1.1, which was
|
||||
This file was extended by gflags $as_me 1.2, which was
|
||||
generated by GNU Autoconf 2.61. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
|
|
@ -22376,7 +22476,7 @@ Report bugs to <bug-autoconf@gnu.org>."
|
|||
_ACEOF
|
||||
cat >>$CONFIG_STATUS <<_ACEOF
|
||||
ac_cs_version="\\
|
||||
gflags config.status 1.1
|
||||
gflags config.status 1.2
|
||||
configured by $0, generated by GNU Autoconf 2.61,
|
||||
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
|
||||
|
||||
|
|
@ -22647,12 +22747,12 @@ host!$host$ac_delim
|
|||
host_cpu!$host_cpu$ac_delim
|
||||
host_vendor!$host_vendor$ac_delim
|
||||
host_os!$host_os$ac_delim
|
||||
TMPDIR!$TMPDIR$ac_delim
|
||||
SED!$SED$ac_delim
|
||||
GREP!$GREP$ac_delim
|
||||
EGREP!$EGREP$ac_delim
|
||||
LN_S!$LN_S$ac_delim
|
||||
ECHO!$ECHO$ac_delim
|
||||
AR!$AR$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||
|
|
@ -22694,6 +22794,7 @@ _ACEOF
|
|||
ac_delim='%!_!# '
|
||||
for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
AR!$AR$ac_delim
|
||||
RANLIB!$RANLIB$ac_delim
|
||||
DSYMUTIL!$DSYMUTIL$ac_delim
|
||||
NMEDIT!$NMEDIT$ac_delim
|
||||
|
|
@ -22722,7 +22823,7 @@ LIBOBJS!$LIBOBJS$ac_delim
|
|||
LTLIBOBJS!$LTLIBOBJS$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 26; then
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 27; then
|
||||
break
|
||||
elif $ac_last_try; then
|
||||
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
# make sure we're interpreted by some minimal autoconf
|
||||
AC_PREREQ(2.57)
|
||||
|
||||
AC_INIT(gflags, 1.1, opensource@google.com)
|
||||
AC_INIT(gflags, 1.2, opensource@google.com)
|
||||
# The argument here is just something that should be in the current directory
|
||||
# (for sanity checking)
|
||||
AC_CONFIG_SRCDIR(README)
|
||||
AM_INIT_AUTOMAKE
|
||||
AM_INIT_AUTOMAKE([dist-zip])
|
||||
AM_CONFIG_HEADER(src/config.h)
|
||||
|
||||
# Checks for programs.
|
||||
|
|
@ -27,11 +27,15 @@ case $host_os in
|
|||
# MinGW. Using this option means an extra link step is executed during
|
||||
# "make install".
|
||||
AC_DISABLE_FAST_INSTALL
|
||||
# /tmp is a mount-point in mingw, and hard to use. use cwd instead
|
||||
TMPDIR=gflags_testdir
|
||||
;;
|
||||
*)
|
||||
AC_ENABLE_FAST_INSTALL
|
||||
TMPDIR=/tmp/gflags
|
||||
;;
|
||||
esac
|
||||
AC_SUBST(TMPDIR)
|
||||
|
||||
# Uncomment this if you'll be exporting libraries (.so's)
|
||||
AC_PROG_LIBTOOL
|
||||
|
|
@ -53,6 +57,7 @@ AC_CHECK_TYPE(u_int16_t, ac_cv_have_u_int16_t=1, ac_cv_have_u_int16_t=0)
|
|||
AC_CHECK_TYPE(__int16, ac_cv_have___int16=1, ac_cv_have___int16=0)
|
||||
|
||||
AC_CHECK_FUNCS([strtoll strtoq])
|
||||
AC_CHECK_FUNCS([setenv putenv]) # MinGW has putenv but not setenv
|
||||
|
||||
AX_C___ATTRIBUTE__
|
||||
# We only care about __attribute__ ((unused))
|
||||
|
|
|
|||
|
|
@ -1,3 +1,9 @@
|
|||
gflags (1.2-1) unstable; urgency=low
|
||||
|
||||
* New upstream release.
|
||||
|
||||
-- Google Inc. <opensource@google.com> Thu, 10 Sep 2009 12:53:04 -0700
|
||||
|
||||
gflags (1.1-1) unstable; urgency=low
|
||||
|
||||
* New upstream release.
|
||||
|
|
|
|||
|
|
@ -47,7 +47,18 @@ mkdir "$RPM_BUILD_DIR"
|
|||
|
||||
cp "$archive" "$RPM_SOURCE_DIR"
|
||||
|
||||
rpmbuild -bb rpm/rpm.spec \
|
||||
# rpmbuild -- as far as I can tell -- asks the OS what CPU it has.
|
||||
# This may differ from what kind of binaries gcc produces. dpkg
|
||||
# does a better job of this, so if we can run 'dpkg --print-architecture'
|
||||
# to get the build CPU, we use that in preference of the rpmbuild
|
||||
# default.
|
||||
target=`dpkg --print-architecture 2>/dev/null` # "" if dpkg isn't found
|
||||
if [ -n "$target" ]
|
||||
then
|
||||
target=" --target $target"
|
||||
fi
|
||||
|
||||
rpmbuild -bb rpm/rpm.spec $target \
|
||||
--define "NAME $PACKAGE" \
|
||||
--define "VERSION $VERSION" \
|
||||
--define "_sourcedir $RPM_SOURCE_DIR" \
|
||||
|
|
|
|||
|
|
@ -32,6 +32,15 @@ The %name-devel package contains static and debug libraries and header
|
|||
files for developing applications that use the %name package.
|
||||
|
||||
%changelog
|
||||
* Thu Sep 10 2009 <opensource@google.com>
|
||||
- Change from '%configure' to something like it, but without -m32
|
||||
|
||||
* Mon Apr 20 2009 <opensource@google.com>
|
||||
- Change build rule to use '%configure' rather than './configure'
|
||||
- Change install to use DESTDIR instead of prefix for make install.
|
||||
- Use wildcards for doc/ and lib/ directories
|
||||
- Use {_libdir}/{_includedir}/etc instead of {prefix}/lib, etc
|
||||
|
||||
* Tue Dec 13 2006 <opensource@google.com>
|
||||
- First draft
|
||||
|
||||
|
|
@ -39,12 +48,15 @@ files for developing applications that use the %name package.
|
|||
%setup
|
||||
|
||||
%build
|
||||
./configure
|
||||
make prefix=%prefix
|
||||
# I can't use '% configure', because it defines -m32 which breaks the
|
||||
# build somehow on my system. But I do take as much from % configure
|
||||
# (in /usr/lib/rpm/macros) as I can.
|
||||
./configure --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} --bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} --datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} --libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} --infodir=%{_infodir}
|
||||
make
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
make prefix=$RPM_BUILD_ROOT%{prefix} install
|
||||
make DESTDIR=$RPM_BUILD_ROOT install
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
|
@ -52,28 +64,20 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%files
|
||||
%defattr(-,root,root)
|
||||
|
||||
## Mark all installed files within /usr/share/doc/{package name} as
|
||||
## documentation. This depends on the following two lines appearing in
|
||||
## Makefile.am:
|
||||
## docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
|
||||
## dist_doc_DATA = AUTHORS COPYING ChangeLog INSTALL NEWS README
|
||||
%docdir %{prefix}/share/doc/%{NAME}-%{VERSION}
|
||||
%{prefix}/share/doc/%{NAME}-%{VERSION}/*
|
||||
|
||||
%{prefix}/lib/libgflags.so.0
|
||||
%{prefix}/lib/libgflags.so.0.0.0
|
||||
%{prefix}/lib/libgflags_nothreads.so.0
|
||||
%{prefix}/lib/libgflags_nothreads.so.0.0.0
|
||||
%{prefix}/bin/gflags_completions.sh
|
||||
%doc AUTHORS COPYING ChangeLog INSTALL NEWS README
|
||||
%doc doc/*
|
||||
|
||||
%{_libdir}/*.so.*
|
||||
%{_bindir}/gflags_completions.sh
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
|
||||
%{prefix}/include/google
|
||||
%{prefix}/include/gflags
|
||||
%{prefix}/lib/libgflags.a
|
||||
%{prefix}/lib/libgflags.la
|
||||
%{prefix}/lib/libgflags.so
|
||||
%{prefix}/lib/libgflags_nothreads.a
|
||||
%{prefix}/lib/libgflags_nothreads.la
|
||||
%{prefix}/lib/libgflags_nothreads.so
|
||||
%{_includedir}/gflags
|
||||
%{_includedir}/google
|
||||
%{_libdir}/*.a
|
||||
%{_libdir}/*.la
|
||||
%{_libdir}/*.so
|
||||
|
|
|
|||
1178
python/gflags.py
1178
python/gflags.py
File diff suppressed because it is too large
Load diff
563
python/gflags_helpxml_test.py
Executable file
563
python/gflags_helpxml_test.py
Executable file
|
|
@ -0,0 +1,563 @@
|
|||
#!/usr/bin/env python
|
||||
|
||||
# Copyright (c) 2009, Google Inc.
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions are
|
||||
# met:
|
||||
#
|
||||
# * Redistributions of source code must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
# * Redistributions in binary form must reproduce the above
|
||||
# copyright notice, this list of conditions and the following disclaimer
|
||||
# in the documentation and/or other materials provided with the
|
||||
# distribution.
|
||||
# * Neither the name of Google Inc. nor the names of its
|
||||
# contributors may be used to endorse or promote products derived from
|
||||
# this software without specific prior written permission.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
"""Unit tests for the XML-format help generated by the gflags.py module."""
|
||||
|
||||
__author__ = 'Alex Salcianu'
|
||||
|
||||
|
||||
import string
|
||||
import StringIO
|
||||
import sys
|
||||
import unittest
|
||||
import xml.dom.minidom
|
||||
import xml.sax.saxutils
|
||||
|
||||
# We use the name 'flags' internally in this test, for historical reasons.
|
||||
# Don't do this yourself! :-) Just do 'import gflags; FLAGS=gflags.FLAGS; etc'
|
||||
import gflags as flags
|
||||
|
||||
# For historic reasons, we use the name module_bar instead of test_module_bar
|
||||
import test_module_bar as module_bar
|
||||
|
||||
def MultiLineEqual(expected_help, help):
|
||||
"""Returns True if expected_help == help. Otherwise returns False
|
||||
and logs the difference in a human-readable way.
|
||||
"""
|
||||
if help == expected_help:
|
||||
return True
|
||||
|
||||
print "Error: FLAGS.MainModuleHelp() didn't return the expected result."
|
||||
print "Got:"
|
||||
print help
|
||||
print "[End of got]"
|
||||
|
||||
help_lines = help.split('\n')
|
||||
expected_help_lines = expected_help.split('\n')
|
||||
|
||||
num_help_lines = len(help_lines)
|
||||
num_expected_help_lines = len(expected_help_lines)
|
||||
|
||||
if num_help_lines != num_expected_help_lines:
|
||||
print "Number of help lines = %d, expected %d" % (
|
||||
num_help_lines, num_expected_help_lines)
|
||||
|
||||
num_to_match = min(num_help_lines, num_expected_help_lines)
|
||||
|
||||
for i in range(num_to_match):
|
||||
if help_lines[i] != expected_help_lines[i]:
|
||||
print "One discrepancy: Got:"
|
||||
print help_lines[i]
|
||||
print "Expected:"
|
||||
print expected_help_lines[i]
|
||||
break
|
||||
else:
|
||||
# If we got here, found no discrepancy, print first new line.
|
||||
if num_help_lines > num_expected_help_lines:
|
||||
print "New help line:"
|
||||
print help_lines[num_expected_help_lines]
|
||||
elif num_expected_help_lines > num_help_lines:
|
||||
print "Missing expected help line:"
|
||||
print expected_help_lines[num_help_lines]
|
||||
else:
|
||||
print "Bug in this test -- discrepancy detected but not found."
|
||||
|
||||
return False
|
||||
|
||||
|
||||
class _MakeXMLSafeTest(unittest.TestCase):
|
||||
|
||||
def _Check(self, s, expected_output):
|
||||
self.assertEqual(flags._MakeXMLSafe(s), expected_output)
|
||||
|
||||
def testMakeXMLSafe(self):
|
||||
self._Check('plain text', 'plain text')
|
||||
self._Check('(x < y) && (a >= b)',
|
||||
'(x < y) && (a >= b)')
|
||||
# Some characters with ASCII code < 32 are illegal in XML 1.0 and
|
||||
# are removed by us. However, '\n', '\t', and '\r' are legal.
|
||||
self._Check('\x09\x0btext \x02 with\x0dsome \x08 good & bad chars',
|
||||
'\ttext with\rsome good & bad chars')
|
||||
|
||||
|
||||
def _ListSeparatorsInXMLFormat(separators, indent=''):
|
||||
"""Generates XML encoding of a list of list separators.
|
||||
|
||||
Args:
|
||||
separators: A list of list separators. Usually, this should be a
|
||||
string whose characters are the valid list separators, e.g., ','
|
||||
means that both comma (',') and space (' ') are valid list
|
||||
separators.
|
||||
indent: A string that is added at the beginning of each generated
|
||||
XML element.
|
||||
|
||||
Returns:
|
||||
A string.
|
||||
"""
|
||||
result = ''
|
||||
separators = list(separators)
|
||||
separators.sort()
|
||||
for sep_char in separators:
|
||||
result += ('%s<list_separator>%s</list_separator>\n' %
|
||||
(indent, repr(sep_char)))
|
||||
return result
|
||||
|
||||
|
||||
class WriteFlagHelpInXMLFormatTest(unittest.TestCase):
|
||||
"""Test the XML-format help for a single flag at a time.
|
||||
|
||||
There is one test* method for each kind of DEFINE_* declaration.
|
||||
"""
|
||||
|
||||
def setUp(self):
|
||||
# self.fv is a FlagValues object, just like flags.FLAGS. Each
|
||||
# test registers one flag with this FlagValues.
|
||||
self.fv = flags.FlagValues()
|
||||
|
||||
def assertMultiLineEqual(self, expected, actual):
|
||||
self.assert_(MultiLineEqual(expected, actual))
|
||||
|
||||
def _CheckFlagHelpInXML(self, flag_name, module_name,
|
||||
expected_output, is_key=False):
|
||||
# StringIO.StringIO is a file object that writes into a memory string.
|
||||
sio = StringIO.StringIO()
|
||||
flag_obj = self.fv[flag_name]
|
||||
flag_obj.WriteInfoInXMLFormat(sio, module_name, is_key=is_key, indent=' ')
|
||||
self.assertMultiLineEqual(sio.getvalue(), expected_output)
|
||||
sio.close()
|
||||
|
||||
def testFlagHelpInXML_Int(self):
|
||||
flags.DEFINE_integer('index', 17, 'An integer flag', flag_values=self.fv)
|
||||
expected_output_pattern = (
|
||||
' <flag>\n'
|
||||
' <file>module.name</file>\n'
|
||||
' <name>index</name>\n'
|
||||
' <meaning>An integer flag</meaning>\n'
|
||||
' <default>17</default>\n'
|
||||
' <current>%d</current>\n'
|
||||
' <type>int</type>\n'
|
||||
' </flag>\n')
|
||||
self._CheckFlagHelpInXML('index', 'module.name',
|
||||
expected_output_pattern % 17)
|
||||
# Check that the output is correct even when the current value of
|
||||
# a flag is different from the default one.
|
||||
self.fv['index'].value = 20
|
||||
self._CheckFlagHelpInXML('index', 'module.name',
|
||||
expected_output_pattern % 20)
|
||||
|
||||
def testFlagHelpInXML_IntWithBounds(self):
|
||||
flags.DEFINE_integer('nb_iters', 17, 'An integer flag',
|
||||
lower_bound=5, upper_bound=27,
|
||||
flag_values=self.fv)
|
||||
expected_output = (
|
||||
' <flag>\n'
|
||||
' <key>yes</key>\n'
|
||||
' <file>module.name</file>\n'
|
||||
' <name>nb_iters</name>\n'
|
||||
' <meaning>An integer flag</meaning>\n'
|
||||
' <default>17</default>\n'
|
||||
' <current>17</current>\n'
|
||||
' <type>int</type>\n'
|
||||
' <lower_bound>5</lower_bound>\n'
|
||||
' <upper_bound>27</upper_bound>\n'
|
||||
' </flag>\n')
|
||||
self._CheckFlagHelpInXML('nb_iters', 'module.name',
|
||||
expected_output, is_key=True)
|
||||
|
||||
def testFlagHelpInXML_String(self):
|
||||
flags.DEFINE_string('file_path', '/path/to/my/dir', 'A test string flag.',
|
||||
flag_values=self.fv)
|
||||
expected_output = (
|
||||
' <flag>\n'
|
||||
' <file>simple_module</file>\n'
|
||||
' <name>file_path</name>\n'
|
||||
' <meaning>A test string flag.</meaning>\n'
|
||||
' <default>/path/to/my/dir</default>\n'
|
||||
' <current>/path/to/my/dir</current>\n'
|
||||
' <type>string</type>\n'
|
||||
' </flag>\n')
|
||||
self._CheckFlagHelpInXML('file_path', 'simple_module',
|
||||
expected_output)
|
||||
|
||||
def testFlagHelpInXML_StringWithXMLIllegalChars(self):
|
||||
flags.DEFINE_string('file_path', '/path/to/\x08my/dir',
|
||||
'A test string flag.', flag_values=self.fv)
|
||||
# '\x08' is not a legal character in XML 1.0 documents. Our
|
||||
# current code purges such characters from the generated XML.
|
||||
expected_output = (
|
||||
' <flag>\n'
|
||||
' <file>simple_module</file>\n'
|
||||
' <name>file_path</name>\n'
|
||||
' <meaning>A test string flag.</meaning>\n'
|
||||
' <default>/path/to/my/dir</default>\n'
|
||||
' <current>/path/to/my/dir</current>\n'
|
||||
' <type>string</type>\n'
|
||||
' </flag>\n')
|
||||
self._CheckFlagHelpInXML('file_path', 'simple_module',
|
||||
expected_output)
|
||||
|
||||
def testFlagHelpInXML_Boolean(self):
|
||||
flags.DEFINE_boolean('use_hack', False, 'Use performance hack',
|
||||
flag_values=self.fv)
|
||||
expected_output = (
|
||||
' <flag>\n'
|
||||
' <key>yes</key>\n'
|
||||
' <file>a_module</file>\n'
|
||||
' <name>use_hack</name>\n'
|
||||
' <meaning>Use performance hack</meaning>\n'
|
||||
' <default>false</default>\n'
|
||||
' <current>false</current>\n'
|
||||
' <type>bool</type>\n'
|
||||
' </flag>\n')
|
||||
self._CheckFlagHelpInXML('use_hack', 'a_module',
|
||||
expected_output, is_key=True)
|
||||
|
||||
def testFlagHelpInXML_Enum(self):
|
||||
flags.DEFINE_enum('cc_version', 'stable', ['stable', 'experimental'],
|
||||
'Compiler version to use.', flag_values=self.fv)
|
||||
expected_output = (
|
||||
' <flag>\n'
|
||||
' <file>tool</file>\n'
|
||||
' <name>cc_version</name>\n'
|
||||
' <meaning><stable|experimental>: '
|
||||
'Compiler version to use.</meaning>\n'
|
||||
' <default>stable</default>\n'
|
||||
' <current>stable</current>\n'
|
||||
' <type>string enum</type>\n'
|
||||
' <enum_value>stable</enum_value>\n'
|
||||
' <enum_value>experimental</enum_value>\n'
|
||||
' </flag>\n')
|
||||
self._CheckFlagHelpInXML('cc_version', 'tool', expected_output)
|
||||
|
||||
def testFlagHelpInXML_CommaSeparatedList(self):
|
||||
flags.DEFINE_list('files', 'a.cc,a.h,archive/old.zip',
|
||||
'Files to process.', flag_values=self.fv)
|
||||
expected_output = (
|
||||
' <flag>\n'
|
||||
' <file>tool</file>\n'
|
||||
' <name>files</name>\n'
|
||||
' <meaning>Files to process.</meaning>\n'
|
||||
' <default>a.cc,a.h,archive/old.zip</default>\n'
|
||||
' <current>[\'a.cc\', \'a.h\', \'archive/old.zip\']</current>\n'
|
||||
' <type>comma separated list of strings</type>\n'
|
||||
' <list_separator>\',\'</list_separator>\n'
|
||||
' </flag>\n')
|
||||
self._CheckFlagHelpInXML('files', 'tool', expected_output)
|
||||
|
||||
def testFlagHelpInXML_SpaceSeparatedList(self):
|
||||
flags.DEFINE_spaceseplist('dirs', 'src libs bin',
|
||||
'Directories to search.', flag_values=self.fv)
|
||||
expected_output = (
|
||||
' <flag>\n'
|
||||
' <file>tool</file>\n'
|
||||
' <name>dirs</name>\n'
|
||||
' <meaning>Directories to search.</meaning>\n'
|
||||
' <default>src libs bin</default>\n'
|
||||
' <current>[\'src\', \'libs\', \'bin\']</current>\n'
|
||||
' <type>whitespace separated list of strings</type>\n'
|
||||
'LIST_SEPARATORS'
|
||||
' </flag>\n').replace('LIST_SEPARATORS',
|
||||
_ListSeparatorsInXMLFormat(string.whitespace,
|
||||
indent=' '))
|
||||
self._CheckFlagHelpInXML('dirs', 'tool', expected_output)
|
||||
|
||||
def testFlagHelpInXML_MultiString(self):
|
||||
flags.DEFINE_multistring('to_delete', ['a.cc', 'b.h'],
|
||||
'Files to delete', flag_values=self.fv)
|
||||
expected_output = (
|
||||
' <flag>\n'
|
||||
' <file>tool</file>\n'
|
||||
' <name>to_delete</name>\n'
|
||||
' <meaning>Files to delete;\n '
|
||||
'repeat this option to specify a list of values</meaning>\n'
|
||||
' <default>[\'a.cc\', \'b.h\']</default>\n'
|
||||
' <current>[\'a.cc\', \'b.h\']</current>\n'
|
||||
' <type>multi string</type>\n'
|
||||
' </flag>\n')
|
||||
self._CheckFlagHelpInXML('to_delete', 'tool', expected_output)
|
||||
|
||||
def testFlagHelpInXML_MultiInt(self):
|
||||
flags.DEFINE_multi_int('cols', [5, 7, 23],
|
||||
'Columns to select', flag_values=self.fv)
|
||||
expected_output = (
|
||||
' <flag>\n'
|
||||
' <file>tool</file>\n'
|
||||
' <name>cols</name>\n'
|
||||
' <meaning>Columns to select;\n '
|
||||
'repeat this option to specify a list of values</meaning>\n'
|
||||
' <default>[5, 7, 23]</default>\n'
|
||||
' <current>[5, 7, 23]</current>\n'
|
||||
' <type>multi int</type>\n'
|
||||
' </flag>\n')
|
||||
self._CheckFlagHelpInXML('cols', 'tool', expected_output)
|
||||
|
||||
|
||||
# The next EXPECTED_HELP_XML_* constants are parts of a template for
|
||||
# the expected XML output from WriteHelpInXMLFormatTest below. When
|
||||
# we assemble these parts into a single big string, we'll take into
|
||||
# account the ordering between the name of the main module and the
|
||||
# name of module_bar. Next, we'll fill in the docstring for this
|
||||
# module (%(usage_doc)s), the name of the main module
|
||||
# (%(main_module_name)s) and the name of the module module_bar
|
||||
# (%(module_bar_name)s). See WriteHelpInXMLFormatTest below.
|
||||
#
|
||||
# NOTE: given the current implementation of _GetMainModule(), we
|
||||
# already know the ordering between the main module and module_bar.
|
||||
# However, there is no guarantee that _GetMainModule will never be
|
||||
# changed in the future (especially since it's far from perfect).
|
||||
EXPECTED_HELP_XML_START = """\
|
||||
<?xml version="1.0"?>
|
||||
<AllFlags>
|
||||
<program>gflags_helpxml_test.py</program>
|
||||
<usage>%(usage_doc)s</usage>
|
||||
"""
|
||||
|
||||
EXPECTED_HELP_XML_FOR_FLAGS_FROM_MAIN_MODULE = """\
|
||||
<flag>
|
||||
<key>yes</key>
|
||||
<file>%(main_module_name)s</file>
|
||||
<name>cc_version</name>
|
||||
<meaning><stable|experimental>: Compiler version to use.</meaning>
|
||||
<default>stable</default>
|
||||
<current>stable</current>
|
||||
<type>string enum</type>
|
||||
<enum_value>stable</enum_value>
|
||||
<enum_value>experimental</enum_value>
|
||||
</flag>
|
||||
<flag>
|
||||
<key>yes</key>
|
||||
<file>%(main_module_name)s</file>
|
||||
<name>cols</name>
|
||||
<meaning>Columns to select;
|
||||
repeat this option to specify a list of values</meaning>
|
||||
<default>[5, 7, 23]</default>
|
||||
<current>[5, 7, 23]</current>
|
||||
<type>multi int</type>
|
||||
</flag>
|
||||
<flag>
|
||||
<key>yes</key>
|
||||
<file>%(main_module_name)s</file>
|
||||
<name>dirs</name>
|
||||
<meaning>Directories to create.</meaning>
|
||||
<default>src libs bins</default>
|
||||
<current>['src', 'libs', 'bins']</current>
|
||||
<type>whitespace separated list of strings</type>
|
||||
%(whitespace_separators)s </flag>
|
||||
<flag>
|
||||
<key>yes</key>
|
||||
<file>%(main_module_name)s</file>
|
||||
<name>file_path</name>
|
||||
<meaning>A test string flag.</meaning>
|
||||
<default>/path/to/my/dir</default>
|
||||
<current>/path/to/my/dir</current>
|
||||
<type>string</type>
|
||||
</flag>
|
||||
<flag>
|
||||
<key>yes</key>
|
||||
<file>%(main_module_name)s</file>
|
||||
<name>files</name>
|
||||
<meaning>Files to process.</meaning>
|
||||
<default>a.cc,a.h,archive/old.zip</default>
|
||||
<current>['a.cc', 'a.h', 'archive/old.zip']</current>
|
||||
<type>comma separated list of strings</type>
|
||||
<list_separator>\',\'</list_separator>
|
||||
</flag>
|
||||
<flag>
|
||||
<key>yes</key>
|
||||
<file>%(main_module_name)s</file>
|
||||
<name>index</name>
|
||||
<meaning>An integer flag</meaning>
|
||||
<default>17</default>
|
||||
<current>17</current>
|
||||
<type>int</type>
|
||||
</flag>
|
||||
<flag>
|
||||
<key>yes</key>
|
||||
<file>%(main_module_name)s</file>
|
||||
<name>nb_iters</name>
|
||||
<meaning>An integer flag</meaning>
|
||||
<default>17</default>
|
||||
<current>17</current>
|
||||
<type>int</type>
|
||||
<lower_bound>5</lower_bound>
|
||||
<upper_bound>27</upper_bound>
|
||||
</flag>
|
||||
<flag>
|
||||
<key>yes</key>
|
||||
<file>%(main_module_name)s</file>
|
||||
<name>to_delete</name>
|
||||
<meaning>Files to delete;
|
||||
repeat this option to specify a list of values</meaning>
|
||||
<default>['a.cc', 'b.h']</default>
|
||||
<current>['a.cc', 'b.h']</current>
|
||||
<type>multi string</type>
|
||||
</flag>
|
||||
<flag>
|
||||
<key>yes</key>
|
||||
<file>%(main_module_name)s</file>
|
||||
<name>use_hack</name>
|
||||
<meaning>Use performance hack</meaning>
|
||||
<default>false</default>
|
||||
<current>false</current>
|
||||
<type>bool</type>
|
||||
</flag>
|
||||
"""
|
||||
|
||||
EXPECTED_HELP_XML_FOR_FLAGS_FROM_MODULE_BAR = """\
|
||||
<flag>
|
||||
<file>%(module_bar_name)s</file>
|
||||
<name>tmod_bar_t</name>
|
||||
<meaning>Sample int flag.</meaning>
|
||||
<default>4</default>
|
||||
<current>4</current>
|
||||
<type>int</type>
|
||||
</flag>
|
||||
<flag>
|
||||
<key>yes</key>
|
||||
<file>%(module_bar_name)s</file>
|
||||
<name>tmod_bar_u</name>
|
||||
<meaning>Sample int flag.</meaning>
|
||||
<default>5</default>
|
||||
<current>5</current>
|
||||
<type>int</type>
|
||||
</flag>
|
||||
<flag>
|
||||
<file>%(module_bar_name)s</file>
|
||||
<name>tmod_bar_v</name>
|
||||
<meaning>Sample int flag.</meaning>
|
||||
<default>6</default>
|
||||
<current>6</current>
|
||||
<type>int</type>
|
||||
</flag>
|
||||
<flag>
|
||||
<file>%(module_bar_name)s</file>
|
||||
<name>tmod_bar_x</name>
|
||||
<meaning>Boolean flag.</meaning>
|
||||
<default>true</default>
|
||||
<current>true</current>
|
||||
<type>bool</type>
|
||||
</flag>
|
||||
<flag>
|
||||
<file>%(module_bar_name)s</file>
|
||||
<name>tmod_bar_y</name>
|
||||
<meaning>String flag.</meaning>
|
||||
<default>default</default>
|
||||
<current>default</current>
|
||||
<type>string</type>
|
||||
</flag>
|
||||
<flag>
|
||||
<key>yes</key>
|
||||
<file>%(module_bar_name)s</file>
|
||||
<name>tmod_bar_z</name>
|
||||
<meaning>Another boolean flag from module bar.</meaning>
|
||||
<default>false</default>
|
||||
<current>false</current>
|
||||
<type>bool</type>
|
||||
</flag>
|
||||
"""
|
||||
|
||||
EXPECTED_HELP_XML_END = """\
|
||||
</AllFlags>
|
||||
"""
|
||||
|
||||
|
||||
class WriteHelpInXMLFormatTest(unittest.TestCase):
|
||||
"""Big test of FlagValues.WriteHelpInXMLFormat, with several flags."""
|
||||
|
||||
def assertMultiLineEqual(self, expected, actual):
|
||||
self.assert_(MultiLineEqual(expected, actual))
|
||||
|
||||
def testWriteHelpInXMLFormat(self):
|
||||
fv = flags.FlagValues()
|
||||
# Since these flags are defined by the top module, they are all key.
|
||||
flags.DEFINE_integer('index', 17, 'An integer flag', flag_values=fv)
|
||||
flags.DEFINE_integer('nb_iters', 17, 'An integer flag',
|
||||
lower_bound=5, upper_bound=27, flag_values=fv)
|
||||
flags.DEFINE_string('file_path', '/path/to/my/dir', 'A test string flag.',
|
||||
flag_values=fv)
|
||||
flags.DEFINE_boolean('use_hack', False, 'Use performance hack',
|
||||
flag_values=fv)
|
||||
flags.DEFINE_enum('cc_version', 'stable', ['stable', 'experimental'],
|
||||
'Compiler version to use.', flag_values=fv)
|
||||
flags.DEFINE_list('files', 'a.cc,a.h,archive/old.zip',
|
||||
'Files to process.', flag_values=fv)
|
||||
flags.DEFINE_spaceseplist('dirs', 'src libs bins',
|
||||
'Directories to create.', flag_values=fv)
|
||||
flags.DEFINE_multistring('to_delete', ['a.cc', 'b.h'],
|
||||
'Files to delete', flag_values=fv)
|
||||
flags.DEFINE_multi_int('cols', [5, 7, 23],
|
||||
'Columns to select', flag_values=fv)
|
||||
# Define a few flags in a different module.
|
||||
module_bar.DefineFlags(flag_values=fv)
|
||||
# And declare only a few of them to be key. This way, we have
|
||||
# different kinds of flags, defined in different modules, and not
|
||||
# all of them are key flags.
|
||||
flags.DECLARE_key_flag('tmod_bar_z', flag_values=fv)
|
||||
flags.DECLARE_key_flag('tmod_bar_u', flag_values=fv)
|
||||
|
||||
# Generate flag help in XML format in the StringIO sio.
|
||||
sio = StringIO.StringIO()
|
||||
fv.WriteHelpInXMLFormat(sio)
|
||||
|
||||
# Check that we got the expected result.
|
||||
expected_output_template = EXPECTED_HELP_XML_START
|
||||
main_module_name = flags._GetMainModule()
|
||||
module_bar_name = module_bar.__name__
|
||||
|
||||
if main_module_name < module_bar_name:
|
||||
expected_output_template += EXPECTED_HELP_XML_FOR_FLAGS_FROM_MAIN_MODULE
|
||||
expected_output_template += EXPECTED_HELP_XML_FOR_FLAGS_FROM_MODULE_BAR
|
||||
else:
|
||||
expected_output_template += EXPECTED_HELP_XML_FOR_FLAGS_FROM_MODULE_BAR
|
||||
expected_output_template += EXPECTED_HELP_XML_FOR_FLAGS_FROM_MAIN_MODULE
|
||||
|
||||
expected_output_template += EXPECTED_HELP_XML_END
|
||||
|
||||
# XML representation of the whitespace list separators.
|
||||
whitespace_separators = _ListSeparatorsInXMLFormat(string.whitespace,
|
||||
indent=' ')
|
||||
expected_output = (
|
||||
expected_output_template %
|
||||
{'usage_doc': sys.modules['__main__'].__doc__,
|
||||
'main_module_name': main_module_name,
|
||||
'module_bar_name': module_bar_name,
|
||||
'whitespace_separators': whitespace_separators})
|
||||
|
||||
actual_output = sio.getvalue()
|
||||
self.assertMultiLineEqual(actual_output, expected_output)
|
||||
|
||||
# Also check that our result is valid XML. minidom.parseString
|
||||
# throws an xml.parsers.expat.ExpatError in case of an error.
|
||||
xml.dom.minidom.parseString(actual_output)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
"Unittest for flags.py module"
|
||||
"Unittest for gflags.py module"
|
||||
|
||||
__pychecker__ = "no-local" # for unittest
|
||||
|
||||
|
|
@ -495,7 +495,7 @@ class FlagsUnitTest(unittest.TestCase):
|
|||
"--testspacelist [] --x 10 "
|
||||
"--noexec --quack "
|
||||
"--test1 "
|
||||
"--testget1 --no? --nodebug --nohelp --nohelpshort "
|
||||
"--testget1 --no? --nodebug --nohelp --nohelpshort --nohelpxml "
|
||||
"--noq --notest0 --notestget2 "
|
||||
"--notestget3 --notestnone")
|
||||
|
||||
|
|
@ -520,7 +520,7 @@ class FlagsUnitTest(unittest.TestCase):
|
|||
"--testspacelist [] --x 10 "
|
||||
"--debug --noexec --quack "
|
||||
"--test1 "
|
||||
"--testget1 --no? --nohelp --nohelpshort "
|
||||
"--testget1 --no? --nohelp --nohelpshort --nohelpxml "
|
||||
"--noq --notest0 --notestget2 "
|
||||
"--notestget3 --notestnone")
|
||||
|
||||
|
|
@ -535,12 +535,25 @@ class FlagsUnitTest(unittest.TestCase):
|
|||
except flags.DuplicateFlag, e:
|
||||
pass
|
||||
|
||||
# Duplicate short flag detection
|
||||
try:
|
||||
flags.DEFINE_boolean("zoom1", 0, "runhelp z1", short_name='z')
|
||||
flags.DEFINE_boolean("zoom2", 0, "runhelp z2", short_name='z')
|
||||
raise AssertionError("duplicate flag detection failed")
|
||||
raise AssertionError("duplicate short flag detection failed")
|
||||
except flags.DuplicateFlag, e:
|
||||
pass
|
||||
self.assertTrue("The flag 'z' is defined twice. " in e.args[0])
|
||||
self.assertTrue("First from" in e.args[0])
|
||||
self.assertTrue(", Second from" in e.args[0])
|
||||
|
||||
# Duplicate mixed flag detection
|
||||
try:
|
||||
flags.DEFINE_boolean("short1", 0, "runhelp s1", short_name='s')
|
||||
flags.DEFINE_boolean("s", 0, "runhelp s2")
|
||||
raise AssertionError("duplicate mixed flag detection failed")
|
||||
except flags.DuplicateFlag, e:
|
||||
self.assertTrue("The flag 's' is defined twice. " in e.args[0])
|
||||
self.assertTrue("First from" in e.args[0])
|
||||
self.assertTrue(", Second from" in e.args[0])
|
||||
|
||||
# Make sure allow_override works
|
||||
try:
|
||||
|
|
@ -1165,6 +1178,7 @@ class FlagsUnitTest(unittest.TestCase):
|
|||
(default: 'false')
|
||||
-?,--[no]help: show this help
|
||||
--[no]helpshort: show usage only for this module
|
||||
--[no]helpxml: like --help, but generates XML output
|
||||
--kwery: <who|what|why|where|when>: ?
|
||||
--l: how long to be
|
||||
(default: '9223372032559808512')
|
||||
|
|
@ -1407,7 +1421,9 @@ class FlagsUnitTest(unittest.TestCase):
|
|||
try:
|
||||
help_flag_help = (
|
||||
" -?,--[no]help: show this help\n"
|
||||
" --[no]helpshort: show usage only for this module")
|
||||
" --[no]helpshort: show usage only for this module\n"
|
||||
" --[no]helpxml: like --help, but generates XML output"
|
||||
)
|
||||
|
||||
expected_help = "\n%s:\n%s" % (sys.argv[0], help_flag_help)
|
||||
|
||||
|
|
@ -1477,18 +1493,18 @@ class FlagsUnitTest(unittest.TestCase):
|
|||
self.assertEqual(flags._GetCallingModule(), sys.argv[0])
|
||||
self.assertEqual(
|
||||
module_foo.GetModuleName(),
|
||||
'google3.pyglib.tests.flags_modules_for_testing.module_foo')
|
||||
'test_module_foo')
|
||||
self.assertEqual(
|
||||
module_bar.GetModuleName(),
|
||||
'google3.pyglib.tests.flags_modules_for_testing.module_bar')
|
||||
'test_module_bar')
|
||||
|
||||
# We execute the following exec statements for their side-effect
|
||||
# (i.e., not raising an error). They emphasize the case that not
|
||||
# all code resides in one of the imported modules: Python is a
|
||||
# really dynamic language, where we can dynamically construct some
|
||||
# code and execute it.
|
||||
code = ("from google3.pyglib import flags\n"
|
||||
"module_name = flags._GetCallingModule()")
|
||||
code = ("import gflags\n"
|
||||
"module_name = gflags._GetCallingModule()")
|
||||
exec code
|
||||
|
||||
# Next two exec statements executes code with a global environment
|
||||
|
|
@ -1517,7 +1533,7 @@ class FlagsUnitTest(unittest.TestCase):
|
|||
module_bar.ExecuteCode(code, global_dict)
|
||||
self.assertEqual(
|
||||
global_dict['module_name'],
|
||||
'google3.pyglib.tests.flags_modules_for_testing.module_bar')
|
||||
'test_module_bar')
|
||||
|
||||
|
||||
def main():
|
||||
|
|
|
|||
|
|
@ -21,6 +21,12 @@
|
|||
/* Define if you have POSIX threads libraries and header files. */
|
||||
#undef HAVE_PTHREAD
|
||||
|
||||
/* Define to 1 if you have the `putenv' function. */
|
||||
#undef HAVE_PUTENV
|
||||
|
||||
/* Define to 1 if you have the `setenv' function. */
|
||||
#undef HAVE_SETENV
|
||||
|
||||
/* Define to 1 if you have the <stdint.h> header file. */
|
||||
#undef HAVE_STDINT_H
|
||||
|
||||
|
|
|
|||
|
|
@ -669,7 +669,7 @@ class FlagRegistry {
|
|||
};
|
||||
|
||||
FlagRegistry* FlagRegistry::global_registry_ = NULL;
|
||||
Mutex FlagRegistry::global_registry_lock_;
|
||||
Mutex FlagRegistry::global_registry_lock_(Mutex::LINKER_INITIALIZED);
|
||||
|
||||
FlagRegistry* FlagRegistry::GlobalRegistry() {
|
||||
MutexLock acquire_lock(&global_registry_lock_);
|
||||
|
|
@ -1037,6 +1037,25 @@ uint32 CommandLineFlagParser::ParseNewCommandLineFlags(int* argc, char*** argv,
|
|||
break; // we treat this as an unrecoverable error
|
||||
} else {
|
||||
value = (*argv)[++i]; // read next arg for value
|
||||
|
||||
// Heuristic to detect the case where someone treats a string arg
|
||||
// like a bool:
|
||||
// --my_string_var --foo=bar
|
||||
// We look for a flag of string type, whose value begins with a
|
||||
// dash, and where the flag-name and value are separated by a
|
||||
// space rather than an '='.
|
||||
// To avoid false positives, we also require the word "true"
|
||||
// or "false" in the help string. Without this, a valid usage
|
||||
// "-lat -30.5" would trigger the warning. The common cases we
|
||||
// want to solve talk about true and false as values.
|
||||
if (value[0] == '-'
|
||||
&& strcmp(flag->type_name(), "string") == 0
|
||||
&& (strstr(flag->help(), "true")
|
||||
|| strstr(flag->help(), "false"))) {
|
||||
fprintf(stderr, "Did you really mean to set flag '%s'"
|
||||
" to the value '%s'?\n",
|
||||
flag->name(), value);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1343,15 +1362,6 @@ bool AddFlagValidator(const void* flag_ptr, ValidateFnProto validate_fn_proto) {
|
|||
// values in a global destructor.
|
||||
// --------------------------------------------------------------------
|
||||
|
||||
// TODO(csilvers): When we're ready to have this error be a fatal one,
|
||||
// change this to give a compilation error (via COMPILE_ASSERT(false)).
|
||||
bool FlagsTypeWarn(const char *name) {
|
||||
cerr << "Flag " << name << " is of type bool, but its default"
|
||||
<< " value is not a boolean. NOTE: This will soon be a"
|
||||
<< " compilations error!";
|
||||
return false;
|
||||
}
|
||||
|
||||
FlagRegisterer::FlagRegisterer(const char* name, const char* type,
|
||||
const char* help, const char* filename,
|
||||
void* current_storage, void* defvalue_storage) {
|
||||
|
|
@ -1530,7 +1540,7 @@ bool GetCommandLineFlagInfo(const char* name, CommandLineFlagInfo* OUTPUT) {
|
|||
CommandLineFlagInfo GetCommandLineFlagInfoOrDie(const char* name) {
|
||||
CommandLineFlagInfo info;
|
||||
if (!GetCommandLineFlagInfo(name, &info)) {
|
||||
fprintf(stderr, "FATAL ERROR: flag name '%s' doesn't exit", name);
|
||||
fprintf(stderr, "FATAL ERROR: flag name '%s' doesn't exist\n", name);
|
||||
commandlineflags_exitfunc(1); // almost certainly exit()
|
||||
}
|
||||
return info;
|
||||
|
|
|
|||
|
|
@ -415,7 +415,7 @@ class FlagRegisterer {
|
|||
void* current_storage, void* defvalue_storage);
|
||||
};
|
||||
|
||||
#ifndef SWIG // In swig, ignore the main flag declarations
|
||||
extern bool FlagsTypeWarn(const char *name);
|
||||
|
||||
// If your application #defines STRIP_FLAG_HELP to a non-zero value
|
||||
// before #including this file, we remove the help message from the
|
||||
|
|
@ -424,6 +424,10 @@ class FlagRegisterer {
|
|||
|
||||
extern const char kStrippedFlagHelp[];
|
||||
|
||||
@ac_google_end_namespace@
|
||||
|
||||
#ifndef SWIG // In swig, ignore the main flag declarations
|
||||
|
||||
#if defined(STRIP_FLAG_HELP) && STRIP_FLAG_HELP > 0
|
||||
// Need this construct to avoid the 'defined but not used' warning.
|
||||
#define MAYBE_STRIPPED_HELP(txt) (false ? (txt) : kStrippedFlagHelp)
|
||||
|
|
@ -459,26 +463,30 @@ extern const char kStrippedFlagHelp[];
|
|||
} \
|
||||
using fL##shorttype::FLAGS_##name
|
||||
|
||||
// For boolean flags, we want to do the extra check that the passed-in
|
||||
// For DEFINE_bool, we want to do the extra check that the passed-in
|
||||
// value is actually a bool, and not a string or something that can be
|
||||
// coerced to a bool. These declarations (no definition needed!) will
|
||||
// help us do that, and never evaluate from, which is important.
|
||||
// We'll use 'sizeof(IsBool(val))' to distinguish.
|
||||
// help us do that, and never evaluate From, which is important.
|
||||
// We'll use 'sizeof(IsBool(val))' to distinguish. This code requires
|
||||
// that the compiler have different sizes for bool & double. Since
|
||||
// this is not guaranteed by the standard, we check it with a
|
||||
// compile-time assert (msg[-1] will give a compile-time error).
|
||||
namespace fLB {
|
||||
struct CompileAssert {};
|
||||
typedef CompileAssert expected_sizeof_double_neq_sizeof_bool[
|
||||
(sizeof(double) != sizeof(bool)) ? 1 : -1];
|
||||
template<typename From> double IsBoolFlag(const From& from);
|
||||
bool IsBoolFlag(bool from);
|
||||
}
|
||||
extern bool FlagsTypeWarn(const char *name);
|
||||
} // namespace fLB
|
||||
|
||||
#define DECLARE_bool(name) DECLARE_VARIABLE(bool,B, name)
|
||||
// We have extra code here to make sure 'val' is actually a boolean.
|
||||
#define DEFINE_bool(name,val,txt) namespace fLB { \
|
||||
const bool FLAGS_nonono##name = \
|
||||
(sizeof(@ac_google_namespace@::fLB::IsBoolFlag(val)) \
|
||||
== sizeof(double)) \
|
||||
? @ac_google_namespace@::FlagsTypeWarn(#name) : true; \
|
||||
} \
|
||||
DEFINE_VARIABLE(bool,B, name, val, txt)
|
||||
#define DEFINE_bool(name,val,txt) \
|
||||
namespace fLB { \
|
||||
typedef CompileAssert FLAG_##name##_value_is_not_a_bool[ \
|
||||
(sizeof(::fLB::IsBoolFlag(val)) != sizeof(double)) ? 1 : -1]; \
|
||||
} \
|
||||
DEFINE_VARIABLE(bool,B, name, val, txt)
|
||||
|
||||
#define DECLARE_int32(name) DECLARE_VARIABLE(@ac_google_namespace@::int32,I, name)
|
||||
#define DEFINE_int32(name,val,txt) DEFINE_VARIABLE(@ac_google_namespace@::int32,I, name, val, txt)
|
||||
|
||||
|
|
@ -522,6 +530,4 @@ extern bool FlagsTypeWarn(const char *name);
|
|||
|
||||
#endif // SWIG
|
||||
|
||||
@ac_google_end_namespace@
|
||||
|
||||
#endif // GOOGLE_GFLAGS_H_
|
||||
|
|
|
|||
63
src/gflags_nc.cc
Normal file
63
src/gflags_nc.cc
Normal file
|
|
@ -0,0 +1,63 @@
|
|||
// Copyright (c) 2009, Google Inc.
|
||||
// All rights reserved.
|
||||
//
|
||||
// Redistribution and use in source and binary forms, with or without
|
||||
// modification, are permitted provided that the following conditions are
|
||||
// met:
|
||||
//
|
||||
// * Redistributions of source code must retain the above copyright
|
||||
// notice, this list of conditions and the following disclaimer.
|
||||
// * Redistributions in binary form must reproduce the above
|
||||
// copyright notice, this list of conditions and the following disclaimer
|
||||
// in the documentation and/or other materials provided with the
|
||||
// distribution.
|
||||
// * Neither the name of Google Inc. nor the names of its
|
||||
// contributors may be used to endorse or promote products derived from
|
||||
// this software without specific prior written permission.
|
||||
//
|
||||
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
// ---
|
||||
// Author: Roberto Bayardo
|
||||
//
|
||||
// A negative compile test for commandlineflags.
|
||||
|
||||
#include <gflags/gflags.h>
|
||||
|
||||
#if defined(TEST_SWAPPED_ARGS)
|
||||
|
||||
DEFINE_bool(some_bool_flag,
|
||||
"the default value should go here, not the description",
|
||||
false);
|
||||
|
||||
|
||||
#elif defined(TEST_INT_INSTEAD_OF_BOOL)
|
||||
|
||||
DEFINE_bool(some_bool_flag_2,
|
||||
0,
|
||||
"should have been an int32 flag but mistakenly used bool instead");
|
||||
|
||||
#elif defined(TEST_BOOL_IN_QUOTES)
|
||||
|
||||
|
||||
DEFINE_bool(some_bool_flag_3,
|
||||
"false",
|
||||
"false in in quotes, which is wrong");
|
||||
|
||||
#elif defined(SANITY)
|
||||
|
||||
DEFINE_bool(some_bool_flag_4,
|
||||
true,
|
||||
"this is the correct usage of DEFINE_bool");
|
||||
|
||||
#endif
|
||||
|
|
@ -57,6 +57,28 @@ using GOOGLE_NAMESPACE::FlagRegisterer;
|
|||
// Returns the number of elements in an array.
|
||||
#define GET_ARRAY_SIZE(arr) (sizeof(arr)/sizeof(*(arr)))
|
||||
|
||||
#if !defined(HAVE_SETENV) && defined(HAVE_PUTENV) // mingw, at least
|
||||
void setenv(const char* name, const char* value, int) {
|
||||
// In windows, it's impossible to set a variable to the empty string.
|
||||
// We handle this by setting it to "0" and the NUL-ing out the \0.
|
||||
// cf http://svn.apache.org/viewvc/stdcxx/trunk/tests/src/environ.cpp?r1=611451&r2=637508&pathrev=637508
|
||||
static const char* const kFakeZero = "0";
|
||||
if (*value == '\0')
|
||||
value = kFakeZero;
|
||||
// Apparently the semantics of putenv() is that the input
|
||||
// must live forever, so we leak memory here. :-(
|
||||
const int nameval_len = strlen(name) + 1 + strlen(value) + 1;
|
||||
char* nameval = reinterpret_cast<char*>(malloc(nameval_len));
|
||||
snprintf(nameval, nameval_len, "%s=%s", name, value);
|
||||
putenv(nameval);
|
||||
if (value == kFakeZero) {
|
||||
nameval[nameval_len - 2] = '\0'; // works when putenv() makes no copy
|
||||
if (*getenv(name) != '\0')
|
||||
*getenv(name) = '\0'; // works when putenv() copies nameval
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
DECLARE_string(tryfromenv); // in gflags.cc
|
||||
|
||||
DEFINE_string(test_tmpdir, "/tmp/gflags_unittest", "Dir we use for temp files");
|
||||
|
|
@ -86,18 +108,6 @@ DEFINE_string(test_str3, "initial", "");
|
|||
// This is used to test setting tryfromenv manually
|
||||
DEFINE_string(test_tryfromenv, "initial", "");
|
||||
|
||||
// boolean flag assigned correctly with bool
|
||||
DEFINE_bool(test_bool_bool, true, "");
|
||||
|
||||
// boolean flag assigned with string
|
||||
DEFINE_bool(test_bool_string, "", "");
|
||||
|
||||
// boolean flag assigned with float
|
||||
DEFINE_bool(test_bool_float, 1.0, "");
|
||||
|
||||
// boolean flag assigned with int
|
||||
DEFINE_bool(test_bool_int, 1, "");
|
||||
|
||||
// Don't try this at home!
|
||||
static int changeable_var = 12;
|
||||
DEFINE_int32(changeable_var, ++changeable_var, "");
|
||||
|
|
@ -249,7 +259,11 @@ vector<void (*)()> g_testlist; // the tests to run
|
|||
#define TEST(a, b) \
|
||||
struct Test_##a##_##b { \
|
||||
Test_##a##_##b() { g_testlist.push_back(&Run); } \
|
||||
static void Run() { FlagSaver fs; RunTest(); } \
|
||||
static void Run() { \
|
||||
FlagSaver fs; \
|
||||
fprintf(stderr, "Running test %s/%s\n", #a, #b); \
|
||||
RunTest(); \
|
||||
} \
|
||||
static void RunTest(); \
|
||||
}; \
|
||||
static Test_##a##_##b g_test_##a##_##b; \
|
||||
|
|
@ -416,6 +430,7 @@ TEST(FlagFileTest, FilenamesOurfileFirst) {
|
|||
-1.0);
|
||||
}
|
||||
|
||||
#ifdef HAVE_FNMATCH_H // otherwise glob isn't supported
|
||||
TEST(FlagFileTest, FilenamesOurfileGlob) {
|
||||
FLAGS_test_string = "initial";
|
||||
FLAGS_test_bool = false;
|
||||
|
|
@ -467,6 +482,7 @@ TEST(FlagFileTest, FilenamesOurfileInBigList) {
|
|||
1,
|
||||
-1.0);
|
||||
}
|
||||
#endif
|
||||
|
||||
// Tests that a failed flag-from-string read keeps flags at default values
|
||||
TEST(FlagFileTest, FailReadFlagsFromString) {
|
||||
|
|
@ -540,8 +556,11 @@ TEST(SetFlagValueTest, OrdinaryValues) {
|
|||
|
||||
|
||||
// Tests that flags can be set to exceptional values.
|
||||
// Note: apparently MINGW doesn't parse inf and nan correctly:
|
||||
// http://www.mail-archive.com/bug-gnulib@gnu.org/msg09573.html
|
||||
// This url says FreeBSD also has a problem, but I didn't see that.
|
||||
TEST(SetFlagValueTest, ExceptionalValues) {
|
||||
#ifdef isinf // on systems without isinf, inf stuff may not work at all
|
||||
#if defined(isinf) && !defined(__MINGW32__)
|
||||
EXPECT_EQ("test_double set to inf\n",
|
||||
SetCommandLineOption("test_double", "inf"));
|
||||
EXPECT_INF(FLAGS_test_double);
|
||||
|
|
@ -558,14 +577,14 @@ TEST(SetFlagValueTest, ExceptionalValues) {
|
|||
SetCommandLineOption("test_double", " "));
|
||||
EXPECT_EQ("",
|
||||
SetCommandLineOption("test_double", ""));
|
||||
#ifdef isinf
|
||||
#if defined(isinf) && !defined(__MINGW32__)
|
||||
EXPECT_EQ("test_double set to -inf\n",
|
||||
SetCommandLineOption("test_double", "-inf"));
|
||||
EXPECT_INF(FLAGS_test_double);
|
||||
EXPECT_GT(0, FLAGS_test_double);
|
||||
#endif
|
||||
|
||||
#ifdef isnan
|
||||
#if defined(isnan) && !defined(__MINGW32__)
|
||||
EXPECT_EQ("test_double set to nan\n",
|
||||
SetCommandLineOption("test_double", "NaN"));
|
||||
EXPECT_NAN(FLAGS_test_double);
|
||||
|
|
@ -1499,7 +1518,13 @@ static int Main(int argc, char **argv) {
|
|||
SetUsageMessage(usage_message.c_str());
|
||||
ParseCommandLineFlags(&argc, &argv, true);
|
||||
|
||||
#ifdef __MINGW32__
|
||||
// I had trouble creating a directory in /tmp from mingw
|
||||
FLAGS_test_tmpdir = "./gflags_unittest_testdir";
|
||||
mkdir(FLAGS_test_tmpdir.c_str()); // mingw has a weird one-arg mkdir
|
||||
#else
|
||||
mkdir(FLAGS_test_tmpdir.c_str(), 0755);
|
||||
#endif
|
||||
|
||||
return RUN_ALL_TESTS();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -215,14 +215,6 @@ Expect $LINENO 0 "gflags_unittest" "gflags_unittest.cc" \
|
|||
# Make sure -- by itself stops argv processing
|
||||
Expect $LINENO 0 "PASS" "" -- --help
|
||||
|
||||
# Make sure boolean flags gives warning when type of default value is not bool
|
||||
Expect $LINENO 0 "Flag test_bool_string is of type bool, but its default value is not a boolean." ""
|
||||
Expect $LINENO 0 "Flag test_bool_float is of type bool, but its default value is not a boolean." ""
|
||||
Expect $LINENO 0 "Flag test_bool_int is of type bool, but its default value is not a boolean." ""
|
||||
|
||||
# Make sure that boolean flags don't give warning when default value is bool
|
||||
Expect $LINENO 0 "" "Flag test_bool_bool is of type bool, but its default value is not a boolean."
|
||||
|
||||
# And we should die if the flag value doesn't pas the validator
|
||||
Expect $LINENO 1 "ERROR: failed validation of new value 'true' for flag 'always_fail'" "" --always_fail
|
||||
|
||||
|
|
|
|||
78
src/mutex.h
78
src/mutex.h
|
|
@ -38,9 +38,12 @@
|
|||
// AC_RWLOCK
|
||||
// The latter is defined in ../autoconf.
|
||||
//
|
||||
// This class is meant to be internal-only, so it's defined in the
|
||||
// global namespace. If you want to expose it, you'll want to move
|
||||
// it to the Google namespace.
|
||||
// This class is meant to be internal-only and should be wrapped by an
|
||||
// internal namespace. Before you use this module, please give the
|
||||
// name of your internal namespace for this module. Or, if you want
|
||||
// to expose it, you'll want to move it to the Google namespace. We
|
||||
// cannot put this class in global namespace because there can be some
|
||||
// problems when we have multiple versions of Mutex in each shared object.
|
||||
//
|
||||
// NOTE: by default, we have #ifdef'ed out the TryLock() method.
|
||||
// This is for two reasons:
|
||||
|
|
@ -95,6 +98,16 @@
|
|||
// colon-initializer) and set it to true via a function that always
|
||||
// evaluates to true, but that the compiler can't know always
|
||||
// evaluates to true. This should be good enough.
|
||||
//
|
||||
// A related issue is code that could try to access the mutex
|
||||
// after it's been destroyed in the global destructors (because
|
||||
// the Mutex global destructor runs before some other global
|
||||
// destructor, that tries to acquire the mutex). The way we
|
||||
// deal with this is by taking a constructor arg that global
|
||||
// mutexes should pass in, that causes the destructor to do no
|
||||
// work. We still depend on the compiler not doing anything
|
||||
// weird to a Mutex's memory after it is destroyed, but for a
|
||||
// static global variable, that's pretty safe.
|
||||
|
||||
#ifndef GOOGLE_MUTEX_H_
|
||||
#define GOOGLE_MUTEX_H_
|
||||
|
|
@ -132,13 +145,26 @@
|
|||
# error Need to implement mutex.h for your architecture, or #define NO_THREADS
|
||||
#endif
|
||||
|
||||
#include <assert.h>
|
||||
#include <stdlib.h> // for abort()
|
||||
|
||||
#define MUTEX_NAMESPACE gflags_mutex_namespace
|
||||
|
||||
namespace MUTEX_NAMESPACE {
|
||||
|
||||
class Mutex {
|
||||
public:
|
||||
// This is used for the single-arg constructor
|
||||
enum LinkerInitialized { LINKER_INITIALIZED };
|
||||
|
||||
// Create a Mutex that is not held by anybody. This constructor is
|
||||
// typically used for Mutexes allocated on the heap or the stack.
|
||||
// See below for a recommendation for constructing global Mutex
|
||||
// objects.
|
||||
inline Mutex();
|
||||
// This constructor should be used for global, static Mutex objects.
|
||||
// It inhibits work being done by the destructor, which makes it
|
||||
// safer for code that tries to acqiure this mutex in their global
|
||||
// destructor.
|
||||
inline Mutex(LinkerInitialized);
|
||||
|
||||
// Destructor
|
||||
inline ~Mutex();
|
||||
|
|
@ -163,6 +189,8 @@ class Mutex {
|
|||
// when we tell it to, and never makes assumptions is_safe_ is
|
||||
// always true. volatile is the most reliable way to do that.
|
||||
volatile bool is_safe_;
|
||||
// This indicates which constructor was called.
|
||||
bool destroy_;
|
||||
|
||||
inline void SetIsSafe() { is_safe_ = true; }
|
||||
|
||||
|
|
@ -185,9 +213,9 @@ class Mutex {
|
|||
// In debug mode, we assert these invariants, while in non-debug mode
|
||||
// we do nothing, for efficiency. That's why everything is in an
|
||||
// assert.
|
||||
#include <assert.h>
|
||||
|
||||
Mutex::Mutex() : mutex_(0) { }
|
||||
Mutex::Mutex(Mutex::LinkerInitialized) : mutex_(0) { }
|
||||
Mutex::~Mutex() { assert(mutex_ == 0); }
|
||||
void Mutex::Lock() { assert(--mutex_ == -1); }
|
||||
void Mutex::Unlock() { assert(mutex_++ == -1); }
|
||||
|
|
@ -199,8 +227,15 @@ void Mutex::ReaderUnlock() { assert(mutex_-- > 0); }
|
|||
|
||||
#elif defined(_WIN32) || defined(__CYGWIN32__) || defined(__CYGWIN64__)
|
||||
|
||||
Mutex::Mutex() { InitializeCriticalSection(&mutex_); SetIsSafe(); }
|
||||
Mutex::~Mutex() { DeleteCriticalSection(&mutex_); }
|
||||
Mutex::Mutex() : destroy_(true) {
|
||||
InitializeCriticalSection(&mutex_);
|
||||
SetIsSafe();
|
||||
}
|
||||
Mutex::Mutex(LinkerInitialized) : destroy_(false) {
|
||||
InitializeCriticalSection(&mutex_);
|
||||
SetIsSafe();
|
||||
}
|
||||
Mutex::~Mutex() { if (destroy_) DeleteCriticalSection(&mutex_); }
|
||||
void Mutex::Lock() { if (is_safe_) EnterCriticalSection(&mutex_); }
|
||||
void Mutex::Unlock() { if (is_safe_) LeaveCriticalSection(&mutex_); }
|
||||
#ifdef GMUTEX_TRYLOCK
|
||||
|
|
@ -212,22 +247,24 @@ void Mutex::ReaderUnlock() { Unlock(); }
|
|||
|
||||
#elif defined(HAVE_PTHREAD) && defined(HAVE_RWLOCK)
|
||||
|
||||
#include <stdlib.h> // for abort()
|
||||
#define SAFE_PTHREAD(fncall) do { /* run fncall if is_safe_ is true */ \
|
||||
if (is_safe_ && fncall(&mutex_) != 0) abort(); \
|
||||
} while (0)
|
||||
|
||||
Mutex::Mutex() {
|
||||
Mutex::Mutex() : destroy_(true) {
|
||||
SetIsSafe();
|
||||
if (is_safe_ && pthread_rwlock_init(&mutex_, NULL) != 0) abort();
|
||||
}
|
||||
Mutex::~Mutex() { SAFE_PTHREAD(pthread_rwlock_destroy); }
|
||||
Mutex::Mutex(Mutex::LinkerInitialized) : destroy_(false) {
|
||||
SetIsSafe();
|
||||
if (is_safe_ && pthread_rwlock_init(&mutex_, NULL) != 0) abort();
|
||||
}
|
||||
Mutex::~Mutex() { if (destroy_) SAFE_PTHREAD(pthread_rwlock_destroy); }
|
||||
void Mutex::Lock() { SAFE_PTHREAD(pthread_rwlock_wrlock); }
|
||||
void Mutex::Unlock() { SAFE_PTHREAD(pthread_rwlock_unlock); }
|
||||
#ifdef GMUTEX_TRYLOCK
|
||||
bool Mutex::TryLock() { return is_safe_ ?
|
||||
pthread_rwlock_trywrlock(&mutex_) == 0 :
|
||||
true; }
|
||||
pthread_rwlock_trywrlock(&mutex_) == 0 : true; }
|
||||
#endif
|
||||
void Mutex::ReaderLock() { SAFE_PTHREAD(pthread_rwlock_rdlock); }
|
||||
void Mutex::ReaderUnlock() { SAFE_PTHREAD(pthread_rwlock_unlock); }
|
||||
|
|
@ -235,16 +272,19 @@ void Mutex::ReaderUnlock() { SAFE_PTHREAD(pthread_rwlock_unlock); }
|
|||
|
||||
#elif defined(HAVE_PTHREAD)
|
||||
|
||||
#include <stdlib.h> // for abort()
|
||||
#define SAFE_PTHREAD(fncall) do { /* run fncall if is_safe_ is true */ \
|
||||
if (is_safe_ && fncall(&mutex_) != 0) abort(); \
|
||||
} while (0)
|
||||
|
||||
Mutex::Mutex() {
|
||||
Mutex::Mutex() : destroy_(true) {
|
||||
SetIsSafe();
|
||||
if (is_safe_ && pthread_mutex_init(&mutex_, NULL) != 0) abort();
|
||||
}
|
||||
Mutex::~Mutex() { SAFE_PTHREAD(pthread_mutex_destroy); }
|
||||
Mutex::Mutex(Mutex::LinkerInitialized) : destroy_(false) {
|
||||
SetIsSafe();
|
||||
if (is_safe_ && pthread_mutex_init(&mutex_, NULL) != 0) abort();
|
||||
}
|
||||
Mutex::~Mutex() { if (destroy_) SAFE_PTHREAD(pthread_mutex_destroy); }
|
||||
void Mutex::Lock() { SAFE_PTHREAD(pthread_mutex_lock); }
|
||||
void Mutex::Unlock() { SAFE_PTHREAD(pthread_mutex_unlock); }
|
||||
#ifdef GMUTEX_TRYLOCK
|
||||
|
|
@ -300,4 +340,10 @@ class WriterMutexLock {
|
|||
#define ReaderMutexLock(x) COMPILE_ASSERT(0, rmutex_lock_decl_missing_var_name)
|
||||
#define WriterMutexLock(x) COMPILE_ASSERT(0, wmutex_lock_decl_missing_var_name)
|
||||
|
||||
} // namespace MUTEX_NAMESPACE
|
||||
|
||||
using namespace MUTEX_NAMESPACE;
|
||||
|
||||
#undef MUTEX_NAMESPACE
|
||||
|
||||
#endif /* #define GOOGLE_MUTEX_H__ */
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue