New release 0.3.1, for chnages see ChangeLog

Author: ihuerner

COPYING

@@ -1,4 +1,3 @@
 This Source Code Form is subject to the terms of the
 Mozilla Public License, v. 2.0. If a  copy of the MPL was not distributed
-with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
+with this file, You can obtain one at http://mozilla.org/MPL/2.0/.

ChangeLog

@@ -1,3 +1,7 @@
+Revision 0.3.1
+- Fixed a problem when accessing prct and key-value database
+- reverted chnage of datastructure mad in revision 0.2.4
+
 Revision 0.3.0
 - Switched to the MPL v2 license
 - Fixed dbus signal issues

src/persistence_client_library.c

@@ -30,11 +30,15 @@
 #include <string.h>
 #include <errno.h>
 #include <stdlib.h>
-#include <dbus/dbus.h>
-
 #include <dlt/dlt.h>
 #include <dlt/dlt_common.h>
 
+#include <dbus/dbus.h>
+
+
+
+#define ENABLE_DBUS_INTERFACE 1
+
 extern char* __progname;
 
 /// debug log and trace (DLT) setup
@@ -87,7 +91,7 @@ const char* gSharedPublicWtPath    = "/Data/mnt-wt/shared/public%s";
 
 
 /// application id
-char gAppId[maxAppNameLen];
+char gAppId[MaxAppNameLen];
 
 /// max key value data size [default 16kB]
 int gMaxKeyValDataSize = defaultMaxKeyValDataSize;
@@ -122,15 +126,16 @@ void pers_library_init(void)
       gMaxKeyValDataSize = atoi(pDataSize);
    }
 
+#if ENABLE_DBUS_INTERFACE == 1
    setup_dbus_mainloop();
 
-
    // register for lifecycle and persistence admin service dbus messages
    register_lifecycle();
    register_pers_admin_service();
+#endif
 
    // clear the open file descriptor array
-   memset(gOpenFdArray, maxPersHandle, sizeof(int));
+   memset(gOpenFdArray, MaxPersHandle, sizeof(int));
 
    /// get custom library names to load
    status = get_custom_libraries();
@@ -178,7 +183,7 @@ void pers_library_init(void)
    }
 
    //printf("A p p l i c a t i o n   n a m e => %s \n", __progname /*program_invocation_short_name*/);   // TODO: only temp solution for application name
-   strncpy(gAppId, __progname, maxAppNameLen);
+   strncpy(gAppId, __progname, MaxAppNameLen);
    // destory mutex
    pthread_mutex_destroy(&gDbusInitializedMtx);
    pthread_cond_destroy(&gDbusInitializedCond);
@@ -189,11 +194,11 @@ void pers_library_init(void)
 void pers_library_destroy(void)
 {
 
-
+#if ENABLE_DBUS_INTERFACE == 1
    // unregister for lifecycle and persistence admin service dbus messages
    unregister_lifecycle();
    unregister_pers_admin_service();
-
+#endif
 
    DLT_UNREGISTER_CONTEXT(persClientLibCtx);
    DLT_UNREGISTER_APP();

src/persistence_client_library.h

@@ -31,9 +31,9 @@
 /// constant definitions
 enum _PersistenceConstantDef
 {
-   resIsNoFile          = 0,        /// flag to identify that resource a not file
-   resIsFile            = 1,        /// flag to identify that resource a file
-   accessNoLock         = 1,        /// flag to indicate that access is not locked
+   ResIsNoFile          = 0,        /// flag to identify that resource a not file
+   ResIsFile            = 1,        /// flag to identify that resource a file
+   AccessNoLock         = 1,        /// flag to indicate that access is not locked
 
    FileClosed           = 0,
    FileOpen             = 1,
@@ -44,9 +44,11 @@ enum _PersistenceConstantDef
 
    PrctKeySize             = 64,    /// persistence resource config table max key size
    PrctValueSize           = 256,   /// persistence resource config table max value size
+   PrctDbTableSize         = 1024,  /// number of persistence resource config tables to store
 
    DbKeySize               = 64,    /// database max key size
    DbValueSize             = 16384, /// database max value size
+   DbTableSize             = 1024,  /// database table size
 
    PasMsg_Block            = 1,     /// persistence administration service block access
    PasMsg_WriteBack        = 2,     /// persistence administration service write_back
@@ -56,10 +58,10 @@ enum _PersistenceConstantDef
    PasErrorStatus_FAIL     = -1,    /// persistence administration service msg return status
 
    CustLibMaxLen = 128,             /// max length of the custom library name and path
-   dbKeyMaxLen   = 128,             /// max database key length
-   dbPathMaxLen  = 128,             /// max database path length
-   maxAppNameLen = 128,             /// max application name
-   maxPersHandle = 256,             /// max number of parallel open persistence handles
+   DbKeyMaxLen   = 128,             /// max database key length
+   DbPathMaxLen  = 128,             /// max database path length
+   MaxAppNameLen = 128,             /// max application name
+   MaxPersHandle = 256,             /// max number of parallel open persistence handles
 
    defaultMaxKeyValDataSize = 16384 /// default limit the key-value data size to 16kB
 };
@@ -104,17 +106,23 @@ typedef struct _PersistenceConfigurationKey_s
 {
    PersistencePolicy_e     policy;           /**< policy  */
    PersistenceStorage_e    storage;          /**< definition of storage to use */
-   PersistenceDbContext_s  context;          /**< database context*/
    unsigned int            permission;       /**< access right, corresponds to UNIX */
    unsigned int            max_size;         /**< max size expected for the key */
    char *                  reponsible;       /**< name of responsible application */
    char *                  custom_name;      /**< name of the customer plugin */
 } PersistenceConfigurationKey_s;
 
 
+/// persistence information
+typedef struct _PersistenceInfo_s
+{
+   PersistenceDbContext_s           context;          /**< database context*/
+   PersistenceConfigurationKey_s    configKey;        /**< prct configuration key*/
 
+} PersistenceInfo_s;
 
 
+/// persistence resource config table type definition
 typedef enum _PersistenceRCT_e
 {
    PersistenceRCT_local         = 0,
@@ -171,7 +179,7 @@ extern const char* gSharedPublicWtPath;
 
 
 /// application id
-extern char gAppId[maxAppNameLen];
+extern char gAppId[MaxAppNameLen];
 
 /// max key value data size
 extern int gMaxKeyValDataSize;