968323 - Debug builds with --disable-logging fail in /security due to MOZ_LOGGING / PR_LOGGING distinction

Status: RESOLVED FIXED

(Core :: Security, defect)

Description

[Daniel Holbert [:dholbert]]

Builds with ac_add_options --disable-logging currently fail in /security, with "use of undeclared identifier" errors like:

security/certverifier/CertVerifier.cpp:158:12: error: use of undeclared identifier 'gCertVerifierLog'

...and...
security/manager/ssl/src/nsNSSComponent.cpp:249:8: error: use of undeclared identifier 'gPIPNSSLog'

...and...
security/manager/ssl/src/PSMContentListener.cpp:279:10: error: use of undeclared identifier 'gPIPNSSLog

This seems to be due to these variables being declared inside of a "#ifdef MOZ_LOGGING" chunk, and then *used* in a "#ifdef PR_LOGGING" chunk. (often implicitly via PR_LOG(), whose behavior depends on whether PR_LOGGING is defined)

We should be declaring these variables inside of #ifdef PR_LOGGING, not MOZ_LOGGING.

Comment 1

[Daniel Holbert [:dholbert]]

Attachment: fix

This fixes the errors for me (and allows me to successfully get through a --disable-logging debug build).

Comment 2

[Daniel Holbert [:dholbert]]

Note: enable-debug disable-logging builds end up in the slightly-confusing state of having PR_LOGGING enabled, despite MOZ_LOGGING being disabled, because of this:
> 162 #if defined(DEBUG) || defined(FORCE_PR_LOG)
> 163 #define PR_LOGGING 1
http://mxr.mozilla.org/mozilla-central/source/nsprpub/pr/include/prlog.h#162

i.e. PR_LOGGING is forced-on in debug builds (which is reasonable).

(I'm not immediately clear what purpose MOZ_LOGGING serves, but it's apparently not equivalent to PR_LOGGING, and hence shouldn't be used as a guard for declaring variables that are used by PR_LOG.)

Comment 3

[Brian Smith (:briansmith, :bsmith, use NEEDINFO?)]

Comment on attachment 8370890 [details] [diff] [review]
fix

Review of attachment 8370890 [details] [diff] [review]:
-----------------------------------------------------------------

NIT: please use r=briansmith in the commit message.

Thanks!

Comment 4

[Daniel Holbert [:dholbert]]

Attachment: [wrong patch]

Found one more chunk that needed updating, on a try run. Fixed here.

As a sanity-check, I confirmed that all the remaining '#ifdef MOZ_LOGGING' lines in /security are only wrapping #defines of FORCE_PR_LOGGING -- not variable-declarations or usages. So I think this should do it.

Comment 5

[Daniel Holbert [:dholbert]]

Attachment: fix v2

[er, sorry, wrong patch. Here's the right one.]

Comment 6

[Daniel Holbert [:dholbert]]

Landed: https://hg.mozilla.org/integration/mozilla-inbound/rev/ca49b7e89881

Comment 7

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/ca49b7e89881