Bug 1720227 NSS using a tempdir to measure sql performance not active r=mt
authorRobert Relyea <rrelyea@redhat.com>
Tue, 13 Jul 2021 10:40:52 -0700
changeset 15958 fc4056907596283ddfc487196f50f7189a398721
parent 15957 de5067764e551097f809b293ca9756d4bd729626
child 15959 b1eac8c86e99fbd6d5dd19971f0f81992008d135
push id3992
push userrrelyea@redhat.com
push dateTue, 13 Jul 2021 21:54:18 +0000
reviewersmt
bugs1720227
Bug 1720227 NSS using a tempdir to measure sql performance not active r=mt Last rebase we submitted a patch that used a subdirectory to measure the performance for the SQLite patch. This code wasn't active by default on linux, however, because of a typo in the build system. This is a low priority issue since NSS does not default to measure, so the patch only affects older versions of RHEL or users that have explicitly asked for 'measure' semantics.
coreconf/Linux.mk
coreconf/config.gypi
--- a/coreconf/Linux.mk
+++ b/coreconf/Linux.mk
@@ -16,17 +16,17 @@ ifneq ($(OS_TARGET),Android)
 	USE_PTHREADS = 1
 endif
 
 ifeq ($(USE_PTHREADS),1)
 	IMPL_STRATEGY = _PTH
 endif
 
 DEFAULT_COMPILER = gcc
-DEFINES += -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE -DSQL_MEASURE_USE_TEMP_DIR
+DEFINES += -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE -DSDB_MEASURE_USE_TEMP_DIR
 
 ifeq ($(OS_TARGET),Android)
 ifndef ANDROID_NDK
 	$(error Must set ANDROID_NDK to the path to the android NDK first)
 endif
 ifndef ANDROID_TOOLCHAIN_VERSION
 	$(error Must set ANDROID_TOOLCHAIN_VERSION to the requested version number)
 endif
--- a/coreconf/config.gypi
+++ b/coreconf/config.gypi
@@ -365,17 +365,17 @@
           [ 'OS=="linux" or OS=="android"', {
             'defines': [
               'LINUX2_1',
               'LINUX',
               'linux',
               '_DEFAULT_SOURCE', # for <endian.h> functions, strdup, realpath, and getentropy
               '_BSD_SOURCE', # for the above in glibc <= 2.19
               '_POSIX_SOURCE', # for <signal.h>
-              'SQL_MEASURE_USE_TEMP_DIR', # use tmpdir for the access calls
+              'SDB_MEASURE_USE_TEMP_DIR', # use tmpdir for the access calls
             ],
           }],
           [ 'OS=="dragonfly" or OS=="freebsd"', {
             'defines': [
               'FREEBSD',
             ],
           }],
           [ 'OS=="netbsd"', {