Use context only for logging.

xrootd · Jan 2, 2014 · a59e0a4 · a59e0a4
1 parent 7f64d4c
commit a59e0a4
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/src/XrdFileCache.cmake b/src/XrdFileCache.cmake
@@ -18,7 +18,7 @@ add_library(
   XrdFileCache/CacheFileInfo.cc      XrdFileCache/CacheFileInfo.hh
   XrdFileCache/IO.cc                 XrdFileCache/IO.hh
   XrdFileCache/IOBlocks.cc           XrdFileCache/IOBlocks.hh
-  XrdFileCache/Context.cc            XrdFileCache/Context.hh )
+  XrdFileCache/Log.cc                XrdFileCache/Log.hh )
 
 target_link_libraries(
   XrdFileCache

diff --git a/src/XrdFileCache/Cache.cc b/src/XrdFileCache/Cache.cc
@@ -20,6 +20,12 @@ XrdFileCache::Cache *XrdFileCache::Cache::m_cache = NULL;
 XrdSysMutex XrdFileCache::Cache::m_cache_mutex;
 
 
+const char* InfoExt = ".cinfo";
+const int InfoExtLen = int(strlen(InfoExt));
+const bool IODisablePrefetch = false;
+const long long PrefetchDefaultBufferSize = 1024*1024;
+
+
 using namespace XrdFileCache;
 
 Cache::Cache(XrdOucCacheStats & stats)

diff --git a/src/XrdFileCache/Cache.hh b/src/XrdFileCache/Cache.hh
@@ -15,6 +15,11 @@
 namespace XrdFileCache
 {
 
+extern const char* InfoExt;
+extern const int InfoExtLen;
+extern const bool IODisablePrefetch;
+extern const long long PrefetchDefaultBufferSize;
+
 class Cache : public XrdOucCache
 {
 

diff --git a/src/XrdFileCache/Context.cc → src/XrdFileCache/Log.cc b/src/XrdFileCache/Context.cc → src/XrdFileCache/Log.cc
@@ -1,4 +1,4 @@
-#include "Context.hh"
+#include "Log.hh"
 #include <stdarg.h>
 #include "XrdSys/XrdSysError.hh"
 #include "XrdOuc/XrdOucCache.hh"
@@ -16,10 +16,6 @@
 namespace XrdFileCache
 {
 LogLevel Dbg;
-const char* InfoExt = ".cinfo";
-const int InfoExtLen = int(strlen(InfoExt));
-const bool IODisablePrefetch = false;
-const long long PrefetchDefaultBufferSize = 1024*1024;
 
 const char* const s_levelNames[] = { "Dump ", "Debug","Info ", "Warn ", "Err  " };
 

diff --git a/src/XrdFileCache/Context.hh → src/XrdFileCache/Log.hh b/src/XrdFileCache/Context.hh → src/XrdFileCache/Log.hh
@@ -13,8 +13,6 @@ class XrdOucCacheIO;
 #define aMsgIO(level, io, format, ...) \
    if (level >= Dbg) XrdFileCache::strprintfIO(level, io, format, ##__VA_ARGS__)
 
-
-
 namespace  XrdFileCache
 { 
 enum LogLevel {
@@ -26,10 +24,6 @@ enum LogLevel {
 };
 
 extern LogLevel Dbg;
-extern const char* InfoExt;
-extern const int InfoExtLen;
-extern const bool IODisablePrefetch;
-extern const long long PrefetchDefaultBufferSize;
 
 const char* levelName(LogLevel);
 void strprintf(LogLevel level, const char* fmt, ...);