[Common-dev] CR-Client: Minor logging system changes
Eric Hyche ehyche at real.comThis is now checked into HEAD. At 07:55 AM 5/27/2004 -0700, Henry Ping wrote: >looks good > >-->Henry > >At 10:24 AM 5/27/2004 -0400, Eric Hyche wrote: > > >>Synopsis: Make HXLOGLx macros available on both client and >> producer profile builds >> >>Overview: When we integrated the producer logging system into >> the client, we did not use the same front end access >> functions that the producer team uses, since we didn't >> want to pay the price of linking in DLLAccess for each >> DLL that wanted to use logging. The front-end functions >> in common/log/logutil/hxtlogutil.cpp/.h were differentiated >> by HELIX_FEATURE_STATICDLLACCESS: If HELIX_FEATURE_STATICDLLACCESS >> was defined, you could use the RSLOG/HXLOG() macros the >> Producer team is used to using. If you didn't have >> HELIX_FEATURE_STATICDLLACCESS, then you used the HXLOGLx() macros >> the client team came up with. HELIX_FEATURE_STATICDLLACCESS was >> then defined in the helix-producer-all-defines profile. >> >> However, it turns out that the producer needs to build >> some client modules as well, such as the client core and mp3 >> file format. These modules have already incorporated the HXLOGLx() >> macros, and therefore since HELIX_FEATURE_STATICDLLACCESS was >> defined in helix-producer-all-defines, then these modules >> failed due >> to the HXLOGLx() macros not being defined. >> >> Therefore, we need to make the HXLOGLx() macros available >> regardless >> of whether HELIX_FEATURE_STATICDLLACCESS is defined. The >> RSLOG/HXLOG() >> macros will still only be available if >> HELIX_FEATURE_STATICDLLACCESS >> is defined. >> >>Files Modified: >>common/log/logutil/hxtlogutil.cpp - Make HXLOGLx macros available >>common/log/logutil/pub/hxtlogutil.h - Make HXLOGLx macros available >>datatype/mp3/fileformat/mp3ff.cpp - Define ENABLE_DLLACCESS_PATHS >>conditionally >> on HELIX_FEATURE_STATICDLLACCESS. >> >>Image Size and Heap Use impact: none >> >>Platforms and Profiles Affected: those that define >>HELIX_FEATURE_STATICDLLACCESS (currently >> only producer profiles) >> >>Distribution Libraries affected: none >> >>Distribution library impact and planned action: n/a >> >>Platforms and Profiles Build Verified: win32 >> >>Platforms and Profiles Functionality verified: win32 >> >>Branch: HEAD only >> >>QA Instructions: none >> >> >>Index: hxtlogutil.cpp >>=================================================================== >>RCS file: /cvsroot/common/log/logutil/hxtlogutil.cpp,v >>retrieving revision 1.2 >>diff -u -w -u -w -r1.2 hxtlogutil.cpp >>--- hxtlogutil.cpp 29 Apr 2004 15:42:57 -0000 1.2 >>+++ hxtlogutil.cpp 27 May 2004 14:13:40 -0000 >>@@ -47,10 +47,9 @@ >> static DLLAccess g_LogDLL; >> BOOL g_bTriedInit = FALSE; >> CHXTMutex g_CreationMutex; >>-#else /* #if defined(HELIX_FEATURE_LOG_STATICDLLACCESS) */ >>+#endif /* #if defined(HELIX_FEATURE_LOG_STATICDLLACCESS) */ >> #include "hlxclib/string.h" >> IHXDllAccessPtr g_spDLLAccess; >>-#endif /* #if defined(HELIX_FEATURE_LOG_STATICDLLACCESS) */ >> IHXTInternalLogWriterPtr g_spLog; >> IHXTLogSystemContextPtr g_spLogSystemContext; >> IHXTLogSystemPtr g_spLogSystem; >>@@ -282,7 +281,7 @@ >> } >> } >> >>-#else /* #if defined(HELIX_FEATURE_LOG_STATICDLLACCESS) */ >>+#endif /* #if defined(HELIX_FEATURE_LOG_STATICDLLACCESS) */ >> >> // These functions require HXEnableLogging() to be called >> // first before they will work >>@@ -450,4 +449,3 @@ >> } >> } >> >>-#endif /* #if defined(HELIX_FEATURE_LOG_STATICDLLACCESS) */ >>Index: pub/hxtlogutil.h >>=================================================================== >>RCS file: /cvsroot/common/log/logutil/pub/hxtlogutil.h,v >>retrieving revision 1.1.1.1 >>diff -u -w -u -w -r1.1.1.1 hxtlogutil.h >>--- pub/hxtlogutil.h 28 Apr 2004 20:26:11 -0000 1.1.1.1 >>+++ pub/hxtlogutil.h 27 May 2004 14:13:40 -0000 >>@@ -87,7 +87,7 @@ >> #define HXTLOG_DEBUG if(0) // compile out >> #endif /* #if defined(_DEBUG) */ >> >>-#else /* #if defined(HELIX_FEATURE_LOG_STATICDLLACCESS) */ >>+#endif /* #if defined(HELIX_FEATURE_LOG_STATICDLLACCESS) */ >> >> #include "hxdllaccess.h" >> #include "hxccf.h" >>@@ -196,7 +196,5 @@ >> >> // This should be kept to the max DLL suffix length >> #define HXLOG_MAXDLLSUFFIXLEN 7 >>- >>-#endif /* #if defined(HELIX_FEATURE_LOG_STATICDLLACCESS) */ >> >> #endif /* #ifndef HXTLOGUTIL_H */ >>Index: mp3ff.cpp >>=================================================================== >>RCS file: /cvsroot/datatype/mp3/fileformat/mp3ff.cpp,v >>retrieving revision 1.33 >>diff -u -w -u -w -r1.33 mp3ff.cpp >>--- mp3ff.cpp 29 Apr 2004 15:43:43 -0000 1.33 >>+++ mp3ff.cpp 27 May 2004 14:13:57 -0000 >>@@ -86,7 +86,7 @@ >> >> //#include "rmfftype.h" // for the HX_SAVE_ENABLED flag >> >>-#ifdef _AIX >>+#if defined(HELIX_FEATURE_LOG_STATICDLLACCESS) || defined(_AIX) >> #include "dllpath.h" >> ENABLE_MULTILOAD_DLLACCESS_PATHS(Rnmp3fmt); >> #endif >> >> >> >> >> >>====================================== >>M. Eric Hyche (ehyche at real.com) >>Core Technologies >>RealNetworks, Inc. >> >> >>_______________________________________________ >>Common-dev mailing list >>Common-dev at lists.helixcommunity.org >>http://lists.helixcommunity.org/mailman/listinfo/common-dev > ====================================== M. Eric Hyche (ehyche at real.com) Core Technologies RealNetworks, Inc.