Merge pull request #842 from FIWARE/hardening/own_lib_for_contextCache

Hardening/own lib for context cache

CMakeLists.txt

@@ -181,6 +181,7 @@ SET (ORION_LIBS
     orionld_context
     orionld_common
     orionld_context
+    orionld_contextCache
     orionld_db
 #    orionld_mongoc
     orionld_mongoCppLegacy
@@ -338,6 +339,7 @@ if (error EQUAL 0)
   ADD_SUBDIRECTORY(src/lib/orionld/common)
   ADD_SUBDIRECTORY(src/lib/orionld/types)
   ADD_SUBDIRECTORY(src/lib/orionld/context)
+  ADD_SUBDIRECTORY(src/lib/orionld/contextCache)
   ADD_SUBDIRECTORY(src/lib/orionld/kjTree)
   ADD_SUBDIRECTORY(src/lib/orionld/db)
   ADD_SUBDIRECTORY(src/lib/orionld/mongoBackend)

src/app/orionld/orionld.cpp

@@ -108,20 +108,20 @@ extern "C"
 #include "metricsMgr/metricsMgr.h"
 #include "logSummary/logSummary.h"
 
-#include "orionld/common/orionldState.h"                    // orionldStateRelease, kalloc, ...
-#include "orionld/common/branchName.h"                      // ORIONLD_BRANCH
-#include "orionld/context/orionldContextCacheRelease.h"     // orionldContextCacheRelease
-#include "orionld/rest/orionldServiceInit.h"                // orionldServiceInit
-#include "orionld/db/dbInit.h"                              // dbInit
-#include "orionld/mqtt/mqttRelease.h"                       // mqttRelease
-#include "orionld/troe/troeInit.h"                          // troeInit
+#include "orionld/common/orionldState.h"                      // orionldStateRelease, kalloc, ...
+#include "orionld/common/branchName.h"                        // ORIONLD_BRANCH
+#include "orionld/contextCache/orionldContextCacheRelease.h"  // orionldContextCacheRelease
+#include "orionld/rest/orionldServiceInit.h"                  // orionldServiceInit
+#include "orionld/db/dbInit.h"                                // dbInit
+#include "orionld/mqtt/mqttRelease.h"                         // mqttRelease
+#include "orionld/troe/troeInit.h"                            // troeInit
 
 #include "orionld/version.h"
 #include "orionld/orionRestServices.h"
 #include "orionld/orionldRestServices.h"
 
-#include "orionld/socketService/socketServiceInit.h"        // socketServiceInit
-#include "orionld/socketService/socketServiceRun.h"         // socketServiceRun
+#include "orionld/socketService/socketServiceInit.h"          // socketServiceInit
+#include "orionld/socketService/socketServiceRun.h"           // socketServiceRun
 
 using namespace orion;
 

src/lib/orionld/context/CMakeLists.txt

@@ -24,7 +24,6 @@ SET (SOURCES
     orionldCoreContext.cpp
     orionldContextCreate.cpp
     orionldContextInit.cpp
-    orionldContextCache.cpp
     orionldContextPresent.cpp
     orionldContextTreePresent.cpp
     orionldContextHashTablesFill.cpp
@@ -39,18 +38,11 @@ SET (SOURCES
     orionldContextSimplify.cpp
     orionldContextFromTree.cpp
     orionldContextFromObject.cpp
-    orionldContextCacheInsert.cpp
     orionldContextUrlGenerate.cpp
     orionldContextFromArray.cpp
-    orionldContextCacheInit.cpp
-    orionldContextCacheLookup.cpp
-    orionldContextCachePresent.cpp
-    orionldContextCacheGet.cpp
-    orionldContextCacheRelease.cpp
     orionldContextItemAlreadyExpanded.cpp
     orionldAttributeExpand.cpp
     orionldSubAttributeExpand.cpp
-    orionldContextCacheDelete.cpp
 )
 
 # Include directories

src/lib/orionld/context/orionldContextFromArray.cpp

@@ -32,14 +32,14 @@ extern "C"
 
 #include "orionld/types/OrionldProblemDetails.h"                 // OrionldProblemDetails, orionldProblemDetailsFill
 #include "orionld/common/orionldState.h"                         // orionldState, kalloc
+#include "orionld/contextCache/orionldContextCacheInsert.h"      // orionldContextCacheInsert
+#include "orionld/contextCache/orionldContextCacheLookup.h"      // orionldContextCacheLookup
+#include "orionld/contextCache/orionldContextCachePresent.h"     // orionldContextCachePresent
 #include "orionld/context/OrionldContext.h"                      // OrionldContext
 #include "orionld/context/orionldContextCreate.h"                // orionldContextCreate
 #include "orionld/context/orionldContextUrlGenerate.h"           // orionldContextUrlGenerate
 #include "orionld/context/orionldContextFromUrl.h"               // orionldContextFromUrl
 #include "orionld/context/orionldContextFromObject.h"            // orionldContextFromObject
-#include "orionld/context/orionldContextCacheInsert.h"           // orionldContextCacheInsert
-#include "orionld/context/orionldContextCacheLookup.h"           // orionldContextCacheLookup
-#include "orionld/context/orionldContextCachePresent.h"          // orionldContextCachePresent
 #include "orionld/context/orionldContextFromArray.h"             // Own interface
 
 

src/lib/orionld/context/orionldContextFromObject.cpp

@@ -39,8 +39,8 @@ extern "C"
 #include "orionld/context/OrionldContext.h"                      // OrionldContext
 #include "orionld/context/orionldContextCreate.h"                // orionldContextCreate
 #include "orionld/context/orionldContextUrlGenerate.h"           // orionldContextUrlGenerate
-#include "orionld/context/orionldContextCacheInsert.h"           // orionldContextCacheInsert
-#include "orionld/context/orionldContextCache.h"                 // ORIONLD_CONTEXT_CACHE_HASH_ARRAY_SIZE
+#include "orionld/contextCache/orionldContextCache.h"            // ORIONLD_CONTEXT_CACHE_HASH_ARRAY_SIZE
+#include "orionld/contextCache/orionldContextCacheInsert.h"      // orionldContextCacheInsert
 #include "orionld/context/orionldContextHashTablesFill.h"        // orionldContextHashTablesFill
 #include "orionld/context/orionldContextFromObject.h"            // Own interface
 

src/lib/orionld/context/orionldContextFromTree.cpp

@@ -40,9 +40,9 @@ extern "C"
 #include "orionld/context/orionldContextFromUrl.h"               // orionldContextFromUrl
 #include "orionld/context/orionldContextFromObject.h"            // orionldContextFromObject
 #include "orionld/context/orionldContextFromArray.h"             // orionldContextFromArray
-#include "orionld/context/orionldContextCacheLookup.h"           // orionldContextCacheLookup
 #include "orionld/context/orionldContextCreate.h"                // orionldContextCreate
-#include "orionld/context/orionldContextCacheInsert.h"           // orionldContextCacheInsert
+#include "orionld/contextCache/orionldContextCacheLookup.h"      // orionldContextCacheLookup
+#include "orionld/contextCache/orionldContextCacheInsert.h"      // orionldContextCacheInsert
 #include "orionld/context/orionldContextFromTree.h"              // Own interface
 
 

src/lib/orionld/context/orionldContextFromUrl.cpp

@@ -32,9 +32,9 @@
 #include "orionld/types/OrionldProblemDetails.h"                 // OrionldProblemDetails, orionldProblemDetailsFill
 #include "orionld/context/OrionldContext.h"                      // OrionldContext
 #include "orionld/context/orionldContextFromBuffer.h"            // orionldContextFromBuffer
-#include "orionld/context/orionldContextCacheLookup.h"           // orionldContextCacheLookup
+#include "orionld/contextCache/orionldContextCacheLookup.h"      // orionldContextCacheLookup
 #include "orionld/context/orionldContextDownload.h"              // orionldContextDownload
-#include "orionld/context/orionldContextCacheInsert.h"           // orionldContextCacheInsert
+#include "orionld/contextCache/orionldContextCacheInsert.h"      // orionldContextCacheInsert
 #include "orionld/context/orionldContextFromUrl.h"               // Own interface
 
 

src/lib/orionld/context/orionldContextHashTablesFill.cpp

@@ -37,7 +37,7 @@ extern "C"
 #include "orionld/types/OrionldProblemDetails.h"                 // OrionldProblemDetails, orionldProblemDetailsFill
 #include "orionld/common/orionldState.h"                         // orionldState, kalloc
 #include "orionld/context/OrionldContext.h"                      // OrionldContext, OrionldContextHashTables
-#include "orionld/context/orionldContextCache.h"                 // ORIONLD_CONTEXT_CACHE_HASH_ARRAY_SIZE
+#include "orionld/contextCache/orionldContextCache.h"            // ORIONLD_CONTEXT_CACHE_HASH_ARRAY_SIZE
 #include "orionld/context/OrionldContextItem.h"                  // OrionldContextItem
 #include "orionld/context/orionldContextPrefixExpand.h"          // orionldContextPrefixExpand
 #include "orionld/context/orionldContextHashTablesFill.h"        // Own interface

src/lib/orionld/context/orionldContextInit.cpp

@@ -38,8 +38,8 @@
 #include "orionld/context/OrionldContext.h"                      // OrionldContext
 #include "orionld/context/orionldCoreContext.h"                  // orionldCoreContextP, orionldDefaultUrl
 #include "orionld/context/OrionldContextItem.h"                  // OrionldContextItem
-#include "orionld/context/orionldContextCacheInit.h"             // orionldContextCacheInit
-#include "orionld/context/orionldContextCacheInsert.h"           // orionldContextCacheInsert
+#include "orionld/contextCache/orionldContextCacheInit.h"        // orionldContextCacheInit
+#include "orionld/contextCache/orionldContextCacheInsert.h"      // orionldContextCacheInsert
 #include "orionld/context/orionldContextFromBuffer.h"            // orionldContextFromBuffer
 #include "orionld/context/orionldContextFromUrl.h"               // orionldContextFromUrl
 #include "orionld/context/orionldContextItemLookup.h"            // orionldContextItemLookup

src/lib/orionld/context/orionldContextPresent.cpp

@@ -32,7 +32,7 @@ extern "C"
 
 #include "orionld/context/OrionldContext.h"                      // OrionldContext
 #include "orionld/context/OrionldContextItem.h"                  // OrionldContextItem
-#include "orionld/context/orionldContextCache.h"                 // ORIONLD_CONTEXT_CACHE_HASH_ARRAY_SIZE
+#include "orionld/contextCache/orionldContextCache.h"            // ORIONLD_CONTEXT_CACHE_HASH_ARRAY_SIZE
 #include "orionld/context/orionldContextPresent.h"               // Own interface
 
 

src/lib/orionld/contextCache/CMakeLists.txt

@@ -0,0 +1,41 @@
+# Copyright 2021 FIWARE Foundation e.V.
+#
+# This file is part of Orion-LD Context Broker.
+#
+# Orion-LD Context Broker is free software: you can redistribute it and/or
+# modify it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# Orion-LD Context Broker is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with Orion-LD Context Broker. If not, see http://www.gnu.org/licenses/.
+#
+# For those usages not covered by this license please contact with
+# orionld at fiware dot org
+
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+
+SET (SOURCES
+    orionldContextCache.cpp
+    orionldContextCacheInsert.cpp
+    orionldContextCacheInit.cpp
+    orionldContextCacheLookup.cpp
+    orionldContextCachePresent.cpp
+    orionldContextCacheGet.cpp
+    orionldContextCacheRelease.cpp
+    orionldContextCacheDelete.cpp
+)
+
+# Include directories
+# -----------------------------------------------------------------
+include_directories("${PROJECT_SOURCE_DIR}/src/lib")
+
+
+# Library declaration
+# -----------------------------------------------------------------
+ADD_LIBRARY(orionld_contextCache STATIC ${SOURCES})

src/lib/orionld/context/orionldContextCache.cpp → src/lib/orionld/contextCache/orionldContextCache.cpp

@@ -26,7 +26,7 @@
 #include <semaphore.h>                                           // sem_t
 
 #include "orionld/context/OrionldContext.h"                      // OrionldContext
-#include "orionld/context/orionldContextCache.h"                 // Own interface
+#include "orionld/contextCache/orionldContextCache.h"            // Own interface
 
 
 

src/lib/orionld/context/orionldContextCache.h → src/lib/orionld/contextCache/orionldContextCache.h

@@ -1,5 +1,5 @@
-#ifndef SRC_LIB_ORIONLD_CONTEXT_ORIONLDCONTEXTCACHE_H_
-#define SRC_LIB_ORIONLD_CONTEXT_ORIONLDCONTEXTCACHE_H_
+#ifndef SRC_LIB_ORIONLD_CONTEXTCACHE_ORIONLDCONTEXTCACHE_H_
+#define SRC_LIB_ORIONLD_CONTEXTCACHE_ORIONLDCONTEXTCACHE_H_
 
 /*
 *
@@ -49,4 +49,4 @@ extern OrionldContext**  orionldContextCache;
 extern int               orionldContextCacheSlots;
 extern int               orionldContextCacheSlotIx;
 
-#endif  // SRC_LIB_ORIONLD_CONTEXT_ORIONLDCONTEXTCACHE_H_
+#endif  // SRC_LIB_ORIONLD_CONTEXTCACHE_ORIONLDCONTEXTCACHE_H_

src/lib/orionld/context/orionldContextCacheDelete.cpp → src/lib/orionld/contextCache/orionldContextCacheDelete.cpp

@@ -28,8 +28,8 @@
 #include "logMsg/traceLevels.h"                                  // Lmt*
 
 #include "orionld/context/OrionldContext.h"                      // OrionldContext
-#include "orionld/context/orionldContextCache.h"                 // Context Cache Internals
-#include "orionld/context/orionldContextCacheDelete.h"           // Own interface
+#include "orionld/contextCache/orionldContextCache.h"            // Context Cache Internals
+#include "orionld/contextCache/orionldContextCacheDelete.h"      // Own interface
 
 
 static void orionldContextCacheRelease(OrionldContext* contextP)

src/lib/orionld/context/orionldContextCacheDelete.h → src/lib/orionld/contextCache/orionldContextCacheDelete.h

@@ -1,5 +1,5 @@
-#ifndef SRC_LIB_ORIONLD_CONTEXT_ORIONLDCONTEXTCACHEDELETE_H_
-#define SRC_LIB_ORIONLD_CONTEXT_ORIONLDCONTEXTCACHEDELETE_H_
+#ifndef SRC_LIB_ORIONLD_CONTEXTCACHE_ORIONLDCONTEXTCACHEDELETE_H_
+#define SRC_LIB_ORIONLD_CONTEXTCACHE_ORIONLDCONTEXTCACHEDELETE_H_
 
 /*
 *
@@ -34,4 +34,4 @@
 //
 extern bool orionldContextCacheDelete(const char* id);
 
-#endif  // SRC_LIB_ORIONLD_CONTEXT_ORIONLDCONTEXTCACHEDELETE_H_
+#endif  // SRC_LIB_ORIONLD_CONTEXTCACHE_ORIONLDCONTEXTCACHEDELETE_H_

src/lib/orionld/context/orionldContextCacheGet.cpp → src/lib/orionld/contextCache/orionldContextCacheGet.cpp

@@ -35,8 +35,9 @@ extern "C"
 #include "orionld/common/orionldState.h"                         // orionldState
 #include "orionld/context/OrionldContext.h"                      // OrionldContext
 #include "orionld/context/OrionldContextItem.h"                  // OrionldContextItem
-#include "orionld/context/orionldContextCache.h"                 // Context Cache Internals
-#include "orionld/context/orionldContextCacheGet.h"              // Own interface
+#include "orionld/contextCache/orionldContextCache.h"            // Context Cache Internals
+#include "orionld/contextCache/orionldContextCacheGet.h"         // Own interface
+
 
 
 extern const char* originName(OrionldContextOrigin origin);  // FIXME: move to own module

src/lib/orionld/context/orionldContextCacheGet.h → src/lib/orionld/contextCache/orionldContextCacheGet.h

@@ -1,5 +1,5 @@
-#ifndef SRC_LIB_ORIONLD_CONTEXT_ORIONLDCONTEXTCACHEGET_H_
-#define SRC_LIB_ORIONLD_CONTEXT_ORIONLDCONTEXTCACHEGET_H_
+#ifndef SRC_LIB_ORIONLD_CONTEXTCACHE_ORIONLDCONTEXTCACHEGET_H_
+#define SRC_LIB_ORIONLD_CONTEXTCACHE_ORIONLDCONTEXTCACHEGET_H_
 
 /*
 *
@@ -38,4 +38,4 @@ extern "C"
 //
 extern KjNode* orionldContextCacheGet(KjNode* arrayP, bool details);
 
-#endif  // SRC_LIB_ORIONLD_CONTEXT_ORIONLDCONTEXTCACHEGET_H_
+#endif  // SRC_LIB_ORIONLD_CONTEXTCACHE_ORIONLDCONTEXTCACHEGET_H_

src/lib/orionld/context/orionldContextCacheInit.cpp → src/lib/orionld/contextCache/orionldContextCacheInit.cpp

@@ -27,8 +27,8 @@
 #include "logMsg/logMsg.h"                                       // LM_*
 #include "logMsg/traceLevels.h"                                  // Lmt*
 
-#include "orionld/context/orionldContextCache.h"                 // Context Cache Internals
-#include "orionld/context/orionldContextCacheInit.h"             // Own interface
+#include "orionld/contextCache/orionldContextCache.h"            // Context Cache Internals
+#include "orionld/contextCache/orionldContextCacheInit.h"        // Own interface
 
 
 

src/lib/orionld/context/orionldContextCacheInit.h → src/lib/orionld/contextCache/orionldContextCacheInit.h

@@ -1,5 +1,5 @@
-#ifndef SRC_LIB_ORIONLD_CONTEXT_ORIONLDCONTEXTCACHEINIT_H_
-#define SRC_LIB_ORIONLD_CONTEXT_ORIONLDCONTEXTCACHEINIT_H_
+#ifndef SRC_LIB_ORIONLD_CONTEXTCACHE_ORIONLDCONTEXTCACHEINIT_H_
+#define SRC_LIB_ORIONLD_CONTEXTCACHE_ORIONLDCONTEXTCACHEINIT_H_
 
 /*
 *
@@ -34,4 +34,4 @@
 //
 extern void orionldContextCacheInit(void);
 
-#endif  // SRC_LIB_ORIONLD_CONTEXT_ORIONLDCONTEXTCACHEINIT_H_
+#endif  // SRC_LIB_ORIONLD_CONTEXTCACHE_ORIONLDCONTEXTCACHEINIT_H_

src/lib/orionld/context/orionldContextCacheInsert.cpp → src/lib/orionld/contextCache/orionldContextCacheInsert.cpp

@@ -33,8 +33,8 @@
 #include "orionld/rest/OrionLdRestService.h"                     // OrionLdRestService
 #include "orionld/serviceRoutines/orionldPostSubscriptions.h"    // orionldPostSubscriptions
 #include "orionld/context/OrionldContext.h"                      // OrionldContext
-#include "orionld/context/orionldContextCache.h"                 // Context Cache Internals
-#include "orionld/context/orionldContextCacheInsert.h"           // Own interface
+#include "orionld/contextCache/orionldContextCache.h"            // Context Cache Internals
+#include "orionld/contextCache/orionldContextCacheInsert.h"      // Own interface
 
 
 

src/lib/orionld/context/orionldContextCacheInsert.h → src/lib/orionld/contextCache/orionldContextCacheInsert.h

@@ -1,5 +1,5 @@
-#ifndef SRC_LIB_ORIONLD_CONTEXT_ORIONLDCONTEXTCACHEINSERT_H_
-#define SRC_LIB_ORIONLD_CONTEXT_ORIONLDCONTEXTCACHEINSERT_H_
+#ifndef SRC_LIB_ORIONLD_CONTEXTCACHE_ORIONLDCONTEXTCACHEINSERT_H_
+#define SRC_LIB_ORIONLD_CONTEXTCACHE_ORIONLDCONTEXTCACHEINSERT_H_
 
 /*
 *
@@ -35,4 +35,4 @@
 //
 extern void orionldContextCacheInsert(OrionldContext* contextP);
 
-#endif  // SRC_LIB_ORIONLD_CONTEXT_ORIONLDCONTEXTCACHEINSERT_H_
+#endif  // SRC_LIB_ORIONLD_CONTEXTCACHE_ORIONLDCONTEXTCACHEINSERT_H_

src/lib/orionld/context/orionldContextCacheLookup.cpp → src/lib/orionld/contextCache/orionldContextCacheLookup.cpp

@@ -28,8 +28,8 @@
 #include "logMsg/traceLevels.h"                                  // Lmt*
 
 #include "orionld/context/OrionldContext.h"                      // OrionldContext
-#include "orionld/context/orionldContextCache.h"                 // Context Cache Internals
-#include "orionld/context/orionldContextCacheLookup.h"           // Own interface
+#include "orionld/contextCache/orionldContextCache.h"            // Context Cache Internals
+#include "orionld/contextCache/orionldContextCacheLookup.h"      // Own interface
 
 
 

src/lib/orionld/context/orionldContextCacheLookup.h → src/lib/orionld/contextCache/orionldContextCacheLookup.h

@@ -1,5 +1,5 @@
-#ifndef SRC_LIB_ORIONLD_CONTEXT_ORIONLDCONTEXTCACHELOOKUP_H_
-#define SRC_LIB_ORIONLD_CONTEXT_ORIONLDCONTEXTCACHELOOKUP_H_
+#ifndef SRC_LIB_ORIONLD_CONTEXTCACHE_ORIONLDCONTEXTCACHELOOKUP_H_
+#define SRC_LIB_ORIONLD_CONTEXTCACHE_ORIONLDCONTEXTCACHELOOKUP_H_
 
 /*
 *
@@ -35,4 +35,4 @@
 //
 extern OrionldContext* orionldContextCacheLookup(const char* url);
 
-#endif  // SRC_LIB_ORIONLD_CONTEXT_ORIONLDCONTEXTCACHELOOKUP_H_
+#endif  // SRC_LIB_ORIONLD_CONTEXTCACHE_ORIONLDCONTEXTCACHELOOKUP_H_

src/lib/orionld/context/orionldContextCachePresent.cpp → src/lib/orionld/contextCache/orionldContextCachePresent.cpp

@@ -25,9 +25,9 @@
 #include "logMsg/logMsg.h"                                       // LM_*
 #include "logMsg/traceLevels.h"                                  // Lmt*
 
-#include "orionld/context/orionldContextCache.h"                 // Context Cache Internals
 #include "orionld/context/orionldContextPresent.h"               // orionldContextPresent
-#include "orionld/context/orionldContextCachePresent.h"          // Own interface
+#include "orionld/contextCache/orionldContextCache.h"            // Context Cache Internals
+#include "orionld/contextCache/orionldContextCachePresent.h"     // Own interface
 
 
 

src/lib/orionld/context/orionldContextCachePresent.h → src/lib/orionld/contextCache/orionldContextCachePresent.h

@@ -1,5 +1,5 @@
-#ifndef SRC_LIB_ORIONLD_CONTEXT_ORIONLDCONTEXTCACHEPRESENT_H_
-#define SRC_LIB_ORIONLD_CONTEXT_ORIONLDCONTEXTCACHEPRESENT_H_
+#ifndef SRC_LIB_ORIONLD_CONTEXTCACHE_ORIONLDCONTEXTCACHEPRESENT_H_
+#define SRC_LIB_ORIONLD_CONTEXTCACHE_ORIONLDCONTEXTCACHEPRESENT_H_
 
 /*
 *
@@ -34,4 +34,4 @@
 //
 extern void orionldContextCachePresent(const char* prefix, const char* info);
 
-#endif  // SRC_LIB_ORIONLD_CONTEXT_ORIONLDCONTEXTCACHEPRESENT_H_
+#endif  // SRC_LIB_ORIONLD_CONTEXTCACHE_ORIONLDCONTEXTCACHEPRESENT_H_

src/lib/orionld/context/orionldContextCacheRelease.cpp → src/lib/orionld/contextCache/orionldContextCacheRelease.cpp

@@ -29,8 +29,8 @@ extern "C"
 #include "kjson/kjFree.h"                                        // kjFree
 }
 
-#include "orionld/context/orionldContextCache.h"                 // orionldContextCache, orionldContextCacheSlotIx
-#include "orionld/context/orionldContextCacheRelease.h"          // Own interface
+#include "orionld/contextCache/orionldContextCache.h"            // orionldContextCache, orionldContextCacheSlotIx
+#include "orionld/contextCache/orionldContextCacheRelease.h"     // Own interface
 
 
 

src/lib/orionld/context/orionldContextCacheRelease.h → src/lib/orionld/contextCache/orionldContextCacheRelease.h

@@ -1,5 +1,5 @@
-#ifndef SRC_LIB_ORIONLD_CONTEXT_ORIONLDCONTEXTCACHERELEASE_H_
-#define SRC_LIB_ORIONLD_CONTEXT_ORIONLDCONTEXTCACHERELEASE_H_
+#ifndef SRC_LIB_ORIONLD_CONTEXTCACHE_ORIONLDCONTEXTCACHERELEASE_H_
+#define SRC_LIB_ORIONLD_CONTEXTCACHE_ORIONLDCONTEXTCACHERELEASE_H_
 
 /*
 *
@@ -34,4 +34,4 @@
 //
 extern void orionldContextCacheRelease(void);
 
-#endif  // SRC_LIB_ORIONLD_CONTEXT_ORIONLDCONTEXTCACHERELEASE_H_
+#endif  // SRC_LIB_ORIONLD_CONTEXTCACHE_ORIONLDCONTEXTCACHERELEASE_H_