-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
-and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+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/.
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
-BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Revision 0.3.0
+- Switched to the MPL v2 license
+- Fixed dbus signal issues
+- Corrected dbus persistence admin interface parameters
+- Removed static code analysis warnings
+- Removed gvdb library, only Itzam/C will be used now.
+- Adjusted customer plugin interface (long to int datatype)
+- Adjusted file and key interface (long to int)
+
+
Revision 0.2.4
- Updated test data
- Internal data reorganization
- Fixed a problem with cursor (warning: still not fully working as expected)
- Fixed a problem with internal database handling
+
Revision 0.2.3
- Fixed handle problem
- added cursor functions
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
-AC_INIT([Persistence Client Library], [0.2.4], [not-valid@xse.de])
+AC_INIT([Persistence Client Library], [0.3.0], [not-valid@xse.de])
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2])
AC_GNU_SOURCE()
PKG_CHECK_MODULES(DEPS,
automotive-dlt
dbus-1
- libitzam
- glib-2.0)
+ libitzam)
AC_SUBST(DEPS_CFLAGS)
AC_SUBST(DEPS_LIBS)
* Company XS Embedded GmbH
*****************************************************************************/
/******************************************************************************
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
- OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 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/.
******************************************************************************/
/**
* @file persistence_client_library_error_def.h
#define EPERS_FILEREMOVE (-25)
/// err code to signalize last entry in DB
#define EPERS_LAST_ENTRY_IN_DB (-26)
+/// internal database error
+#define EPERS_DB_ERROR_INTERNAL (-27)
+/// db key size is to long
+#define EPERS_DB_KEY_SIZE (-28)
+/// db value size is to long
+#define EPERS_DB_VALUE_SIZE (-29)
/**
* Company XS Embedded GmbH
*****************************************************************************/
/******************************************************************************
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
- OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 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/.
******************************************************************************/
/**
* @file persistence_client_library_file.h
#endif
-#define PERSIST_FILEAPI_INTERFACE_VERSION (0x01000000U)
+#define PERSIST_FILEAPI_INTERFACE_VERSION (0x01030000U)
* On error a negative value will be returned with th follwoing error codes:
* EPERS_LOCKFS or EPERS_COMMON
*/
-int file_read_data(int fd, void * buffer, unsigned long buffer_size);
+int file_read_data(int fd, void * buffer, int buffer_size);
* On error a negative value will be returned with th follwoing error codes:
* EPERS_LOCKFS or EPERS_COMMON
*/
-int file_write_data(int fd, const void * buffer, unsigned long buffer_size);
+int file_write_data(int fd, const void * buffer, int buffer_size);
* Company XS Embedded GmbH
*****************************************************************************/
/******************************************************************************
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
- OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 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/.
******************************************************************************/
/**
* @file persistence_client_library_key.h
#endif
-#define PERSIST_KEYVALUEAPI_INTERFACE_VERSION (0x01000000U)
+#define PERSIST_KEYVALUEAPI_INTERFACE_VERSION (0x01030000U)
* @return positive value: the bytes read; On error a negative value will be returned with th follwoing error codes:
*
*/
-int key_handle_read_data(int key_handle, unsigned char* buffer, unsigned long buffer_size);
+int key_handle_read_data(int key_handle, unsigned char* buffer, int buffer_size);
*
* @return positive value: the bytes written; On error a negative value will be returned with th follwoing error codes:
*/
-int key_handle_write_data(int key_handle, unsigned char* buffer, unsigned long buffer_size);
+int key_handle_write_data(int key_handle, unsigned char* buffer, int buffer_size);
*
* @return positive value: the bytes read; On error a negative value will be returned with th follwoing error codes:
*/
-int key_read_data(unsigned char ldbid, char* resource_id, unsigned char user_no, unsigned char seat_no, unsigned char* buffer, unsigned long buffer_size);
+int key_read_data(unsigned char ldbid, char* resource_id, unsigned char user_no, unsigned char seat_no, unsigned char* buffer, int buffer_size);
*
* @return positive value: the bytes written; On error a negative value will be returned with th follwoing error codes:
*/
-int key_write_data(unsigned char ldbid, char* resource_id, unsigned char user_no, unsigned char seat_no, unsigned char* buffer, unsigned long buffer_size);
+int key_write_data(unsigned char ldbid, char* resource_id, unsigned char user_no, unsigned char seat_no, unsigned char* buffer, int buffer_size);
#ifdef __cplusplus
Name: persistence client library
Description: persistence client library
Version: @VERSION@
-Requires: automotive-dlt glib-2.0
-Libs: -L${libdir} -lgvdb -lrt -lglib-2.0 -ldl
+Requires: automotive-dlt
+Libs: -L${libdir} -lrt -ldl
Cflags: -I${includedir}
if DEBUG
-AM_CFLAGS = $(DEPS_CFLAGS) -g -I../include \
- -Iglib-2.0 \
- -Idbus-1.0 \
- -Iglib-2.0/include
+AM_CFLAGS = $(DEPS_CFLAGS) -g -I../include \
+ -Idbus-1.0
else
-AM_CFLAGS = $(DEPS_CFLAGS) -I../include \
- -Iglib-2.0 \
- -Idbus-1.0 \
- -Iglib-2.0/include
+AM_CFLAGS = $(DEPS_CFLAGS) -I../include \
+ -Idbus-1.0
endif
lib_LTLIBRARIES = libpersistence_client_library.la
-libpersistence_client_library_la_LIBADD = $(DEPS_LIBS) -ldl -lgvdb
+libpersistence_client_library_la_LIBADD = $(DEPS_LIBS) -ldl
libpersistence_client_library_la_SOURCES = \
persistence_client_library_dbus_service.c \
persistence_client_library_custom_loader.c \
persistence_client_library_access_helper.c \
+ persistence_client_library_itzam_errors.c \
crc32.c
libpersistence_client_library_la_LDFLAGS = -export-dynamic $(LDFLAGS)
* Company XS Embedded GmbH
*****************************************************************************/
/******************************************************************************
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
- OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * Copyright
+ *
+ * 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/.
******************************************************************************/
/**
* @file crc32.h
* Company XS Embedded GmbH
*****************************************************************************/
/******************************************************************************
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTIcacheON WITH THE SOFTWARE
- OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 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/.
******************************************************************************/
/**
* @file persistence_client_library.c
/// debug log and trace (DLT) setup
DLT_DECLARE_CONTEXT(persClientLibCtx);
+const char* gResTableCfg = "/resource-table-cfg.itz";
-/// resource configuration table name
-const char* gResTableCfg = "/resource-table-cfg.gvdb";
-#ifdef USE_GVDB
-/// shared cached default database
-const char* gSharedCachedDefault = "/cached-default.dconf";
-/// shared cached database
-const char* gSharedCached = "/cached.dconf";
-/// shared write through default database
-const char* gSharedWtDefault = "wt-default.dconf";
-/// shared write through database
-const char* gSharedWt = "/wt.dconf";
-#else
/// shared cached default database
const char* gSharedCachedDefault = "/cached-default.itz";
/// shared cached database
const char* gSharedWtDefault = "/wt-default.itz";
/// shared write through database
const char* gSharedWt = "/wt.itz";
-#endif
+
/// local cached default database
-#ifdef USE_GVDB
-const char* gLocalCachedDefault = "cached-default.gvdb";
-/// local cached default database
-const char* gLocalCached = "/cached.gvdb";
-/// local write through default database
-const char* gLocalWtDefault = "wt-default.gvdb";
-/// local write through default database
-const char* gLocalWt = "/wt.gvdb";
-#else
const char* gLocalCachedDefault = "cached-default.itz";
/// local cached default database
const char* gLocalCached = "/cached.itz";
const char* gLocalWtDefault = "wt-default.itz";
/// local write through default database
const char* gLocalWt = "/wt.itz";
-#endif
+
/// directory structure node name defintion
int status = 0;
int i = 0;
- //DLT_REGISTER_APP("Persistence Client Library","persClientLib");
- //DLT_REGISTER_CONTEXT(persClientLibCtx,"persClientLib","Context for Logging");
+ DLT_REGISTER_APP("Persistence Client Library","persClientLib");
+ DLT_REGISTER_CONTEXT(persClientLibCtx,"persClientLib","Context for Logging");
- //DLT_LOG(persClientLibCtx, DLT_LOG_ERROR, DLT_STRING("Initialize Persistence Client Library!!!!"));
+ DLT_LOG(persClientLibCtx, DLT_LOG_ERROR, DLT_STRING("Initialize Persistence Client Library!!!!"));
/// environment variable for on demand loading of custom libraries
const char *pOnDemandLoad = getenv("PERS_CUSTOM_LIB_LOAD_ON_DEMAND");
gMaxKeyValDataSize = atoi(pDataSize);
}
- // initialize mutex
- pthread_mutex_init(&gDbusInitializedMtx, NULL);
-
- // setup dbus main dispatching loop
- printf("*** setup dbus main loop\n");
setup_dbus_mainloop();
- // wain until dbus main loop has been setup and running
- //pthread_mutex_lock(&gDbusInitializedMtx);
-
// register for lifecycle and persistence admin service dbus messages
register_lifecycle();
//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);
+ // destory mutex
+ pthread_mutex_destroy(&gDbusInitializedMtx);
+ pthread_cond_destroy(&gDbusInitializedCond);
}
void pers_library_destroy(void)
{
- // destory mutex
- pthread_mutex_destroy(&gDbusInitializedMtx);
+
// unregister for lifecycle and persistence admin service dbus messages
unregister_lifecycle();
* Company XS Embedded GmbH
*****************************************************************************/
/******************************************************************************
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
- OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 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/.
******************************************************************************/
/**
* @file persistence_client_library.h
#include "persistence_client_library_lc_interface.h"
#include "../include/persistence_client_library_error_def.h"
-#include <gvdb-reader.h>
#include "crc32.h"
#include <string.h>
#include <stdio.h>
+
/// constant definitions
enum _PersistenceConstantDef
{
NsmErrorStatus_OK = 1,
NsmErrorStatus_Fail = -1,
- KeySize = 64,
- ValueSize = 16384,
+ PrctKeySize = 64, /// persistence resource config table max key size
+ PrctValueSize = 256, /// persistence resource config table max value size
+
+ DbKeySize = 64, /// database max key size
+ DbValueSize = 16384, /// database max value size
PasMsg_Block = 1, /// persistence administration service block access
PasMsg_WriteBack = 2, /// persistence administration service write_back
* Company XS Embedded GmbH
*****************************************************************************/
/******************************************************************************
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
- OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 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/.
******************************************************************************/
/**
* @file persistence_client_library_access_helper.c
#include "persistence_client_library_access_helper.h"
-#include "gvdb-builder.h"
-
+#include "persistence_client_library_itzam_errors.h"
#include <stdlib.h>
/// pointer to resource table database
-GvdbTable* gResource_table[] = { NULL, NULL, NULL, NULL };
+itzam_btree gResource_table[4];
+/// array to hold the information of database is already open
+int gResourceOpen[] = {0,0,0,0};
+
+/// structure definition of an persistence resource configuration table entry
+typedef struct record_t
+{
+ char m_key[PrctKeySize]; // the key
+ char m_data[PrctValueSize]; // data for the key
+}
+prct_record;
PersistenceRCT_e get_table_id(int ldbid, int* groupId)
}
-GvdbTable* get_resource_cfg_table_by_idx(int i)
+itzam_btree* get_resource_cfg_table_by_idx(int i)
{
- return gResource_table[i];
+ return &gResource_table[i];
}
// status: OK
-GvdbTable* get_resource_cfg_table(PersistenceRCT_e rct, int group)
+itzam_btree* get_resource_cfg_table(PersistenceRCT_e rct, int group)
{
- if(gResource_table[rct] == NULL) // check if database is already open
+ if(gResourceOpen[rct] == 0) // check if database is already open
{
- GError* error = NULL;
+ itzam_state state;
char filename[dbPathMaxLen];
memset(filename, 0, dbPathMaxLen);
printf("get_resource_cfg_table - error: no valid PersistenceRCT_e\n");
break;
}
-
- gResource_table[rct] = gvdb_table_new(filename, TRUE, &error);
- //printf("get_resource_cfg_table - group %d | db filename: %s \n", group, filename);
-
- if(gResource_table[rct] == NULL)
+ //printf("get_resource_cfg_table => %s \n", filename);
+ state = itzam_btree_open(&gResource_table[rct], filename, itzam_comparator_string, error_handler, 0 , 0);
+ if(state != ITZAM_OKAY)
{
- printf("get_resource_cfg_table - Database error: %s\n", error->message);
- g_error_free(error);
- error = NULL;
+ fprintf(stderr, "\nget_resource_cfg_table => Itzam problem: %s\n", STATE_MESSAGES[state]);
}
+ gResourceOpen[rct] = 1;
}
- return gResource_table[rct];
+ return &gResource_table[rct];
}
{
int rval = 1;
char* token = NULL;
+ //printf("\nde_serialize_data: %s \n", buffer);
if((buffer != NULL) && (pc != NULL))
{
token = strtok(buffer, " "); // policy
rct = get_table_id(dbContext->context.ldbid, &groupId);
// get resource configuration table
- GvdbTable* resource_table = get_resource_cfg_table(rct, groupId);
+ itzam_btree* resource_table = get_resource_cfg_table(rct, groupId);
if(resource_table != NULL)
{
- GVariant* dbValue = NULL;
-
+ prct_record search;
// check if resouce id is in write through table
- dbValue = gvdb_table_get_value(resource_table, resource_id);
-
- if(dbValue != NULL)
+ if(itzam_true == itzam_btree_find(resource_table, resource_id, &search))
{
-
- gconstpointer valuePtr = NULL;
- int size = g_variant_get_size(dbValue);
- valuePtr = g_variant_get_data(dbValue);
- if(valuePtr != NULL)
+ //printf("get_db_context ==> data: %s\n", search.m_data);
+ de_serialize_data(search.m_data, dbContext);
+ if(dbContext->storage != PersistenceStorage_custom )
+ {
+ rval = get_db_path_and_key(dbContext, resource_id, isFile, dbKey, dbPath);
+ }
+ else
{
- char* buffer = malloc(size);
- if(buffer != NULL)
- {
- memcpy(buffer, valuePtr, size);
- de_serialize_data(buffer, dbContext);
-
- if(dbContext->storage != PersistenceStorage_custom )
- {
- rval = get_db_path_and_key(dbContext, resource_id, isFile, dbKey, dbPath);
- }
- else
- {
- //printf("***************** dbEntry.custom_name %s \n", dbEntry.custom_name);
- // if customer storage, we use the custom name as path
- strncpy(dbPath, dbContext->custom_name, strlen(dbContext->custom_name));
- }
-
- free(buffer);
- buffer = NULL;
- free_pers_conf_key(dbContext);
- resourceFound = 1;
- }
+ // if customer storage, we use the custom name as path
+ strncpy(dbPath, dbContext->custom_name, strlen(dbContext->custom_name));
}
+ free_pers_conf_key(dbContext);
+ resourceFound = 1;
}
else
{
rval = EPERS_NOPRCTABLE;
}
-
if(resourceFound == 0)
{
printf("get_db_context - error resource not found %s \n", resource_id);
* Company XS Embedded GmbH
*****************************************************************************/
/******************************************************************************
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
- OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 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/.
******************************************************************************/
/**
* @file persistence_client_library_access_helper.h
*/
#include "persistence_client_library.h"
-
+#include <itzam.h>
/**
* @brief Create database search key and database location path
*
* @return pointer to the gvdb database table or NULL if no valid database has been found
*/
-GvdbTable* get_resource_cfg_table_by_idx(int i);
+itzam_btree* get_resource_cfg_table_by_idx(int i);
/**
void free_pers_conf_key(PersistenceConfigurationKey_s* pc);
-
#endif /* PERSISTENCE_CLIENT_LIBRARY_ACCESS_HELPER_H */
* Company XS Embedded GmbH
*****************************************************************************/
/******************************************************************************
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
- OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 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/.
******************************************************************************/
/**
* @file persistence_client_library_custom_loader.c
* Company XS Embedded GmbH
*****************************************************************************/
/******************************************************************************
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
- OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 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/.
******************************************************************************/
/**
* @file persistence_client_library_custom_loader.h
void* handle;
/// create backup
- long (*custom_plugin_create_backup)(const char* backup_id);
+ int (*custom_plugin_create_backup)(const char* backup_id);
/// custom library deinit function
int (*custom_plugin_deinit)();
int (*custom_plugin_delete_data)(const char* path);
/// get backup
- long (*custom_plugin_get_backup)(const char* backup_id, long size);
+ int (*custom_plugin_get_backup)(const char* backup_id, int size);
// get the size
int (*custom_plugin_get_size)(const char* path);
/// custom get data function
- long (*custom_plugin_get_data)(const char* path, char* buffer, long size);
+ int (*custom_plugin_get_data)(const char* path, char* buffer, int size);
/// custom close function
int (*custom_plugin_handle_close)(int handle);
/// custom get data function
- long (*custom_plugin_handle_get_data)(long handle, char* buffer, long size);
+ int (*custom_plugin_handle_get_data)(int handle, char* buffer, int size);
/// custom open function
- long (*custom_plugin_handle_open)(const char* path, int flag, int mode);
+ int (*custom_plugin_handle_open)(const char* path, int flag, int mode);
/// custom set data function
- long (*custom_plugin_handle_set_data)(long handle, char* buffer, long size);
+ int (*custom_plugin_handle_set_data)(int handle, char* buffer, int size);
/// custom library init function
int (*custom_plugin_init)();
/// restore backup
- long (*custom_plugin_restore_backup)(const char* backup_id);
+ int (*custom_plugin_restore_backup)(const char* backup_id);
/// custom set data function
- long (*custom_plugin_set_data)(const char* path, char* buffer, long size);
+ int (*custom_plugin_set_data)(const char* path, char* buffer, int size);
/// custom status notification function
int (*custom_plugin_get_status_notification_clbk)(plugin_callback_t pFunct);
* Company XS Embedded GmbH
*****************************************************************************/
/******************************************************************************
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
- OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 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/.
******************************************************************************/
/**
* @file persistence_client_library_data_access.c
#include "persistence_client_library_data_access.h"
#include "persistence_client_library_custom_loader.h"
+#include "persistence_client_library_access_helper.h"
#include "persistence_client_library_itzam_errors.h"
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
-#include <itzam.h>
-// definition of a key-value pair
+
+/// definition of a key-value pair stored in the database
typedef struct _KeyValuePair_s
{
- char m_key[KeySize];
- char m_data[ValueSize];
+ char m_key[DbKeySize]; /// the key
+ char m_data[DbValueSize]; /// the data
+ unsigned int m_data_size; /// the size of the data
}
KeyValuePair_s;
/// handle index
static int gHandleIdx = 1;
-static int gInitialized = 0;
-
/// free handle array
int gFreeCursorHandleArray[maxPersHandle];
// free head index
int gFreeCursorHandleIdxHead = 0;
-// mutex
-pthread_mutex_t gMtx;
+// mutex to controll access to the cursor array
+pthread_mutex_t gMtx = PTHREAD_MUTEX_INITIALIZER;
/// btree array
};
-void error_handler(const char * function_name, itzam_error error)
-{
- fprintf(stderr, "Itzam error in %s: %s\n", function_name, ERROR_STRINGS[error]);
-}
-
-
itzam_btree* database_get(PersistenceStorage_e storage, PersistencePolicy_e policy, const char* dbPath)
{
itzam_btree* btree = NULL;
- if( (storage >= PersistenceStorage_local)
- && (storage <= PersistenceStorage_shared) )
+ if(storage <= PersistenceStorage_shared)
{
if(gBtreeCreated[storage][policy] == 0)
{
state = itzam_btree_open(&gBtree[storage][policy], dbPath, itzam_comparator_string, error_handler, 0/*recover*/, 0/*read_only*/);
if (state != ITZAM_OKAY)
{
- fprintf(stderr, "Open Itzam problem: %s\n", STATE_MESSAGES[state]);
+ fprintf(stderr, "database_get ==> Open Itzam problem: %s\n", STATE_MESSAGES[state]);
}
gBtreeCreated[storage][policy] = 1;
}
{
printf("btree_get ==> invalid storage type\n");
}
-
return btree;
}
void database_close(PersistenceStorage_e storage, PersistencePolicy_e policy)
{
- if( (storage >= PersistenceStorage_local)
- && (storage <= PersistenceStorage_shared) )
+ if(storage <= PersistenceStorage_shared )
{
itzam_state state = ITZAM_FAILED;
state = itzam_btree_close(&gBtree[storage][policy]);
if (state != ITZAM_OKAY)
{
- fprintf(stderr, "Close Itzam problem: %s\n", STATE_MESSAGES[state]);
+ fprintf(stderr, "database_close ==> Close Itzam problem: %s\n", STATE_MESSAGES[state]);
}
gBtreeCreated[storage][policy] = 0;
}
-int persistence_get_data(char* dbPath, char* key, PersistenceStorage_e storage, PersistencePolicy_e policy, unsigned char* buffer, unsigned long buffer_size)
+int persistence_get_data(char* dbPath, char* key, PersistenceStorage_e storage, PersistencePolicy_e policy, unsigned char* buffer, unsigned int buffer_size)
{
int read_size = -1;
{
if(itzam_true == itzam_btree_find(btree, key, &search))
{
- read_size = strlen(search.m_data);
+ read_size = search.m_data_size;
if(read_size > buffer_size)
{
read_size = buffer_size; // truncate data size to buffer size
else
{
read_size = EPERS_NOPRCTABLE;
- fprintf(stderr, "\nOpen Itzam problem: %s\n", STATE_MESSAGES[state]);
+ fprintf(stderr, "\npersistence_get_data ==> Open Itzam problem: %s\n", STATE_MESSAGES[state]);
}
}
else if(PersistenceStorage_custom == storage) // custom storage implementation via custom library
-int persistence_set_data(char* dbPath, char* key, PersistenceStorage_e storage, PersistencePolicy_e policy, unsigned char* buffer, unsigned long buffer_size)
+int persistence_set_data(char* dbPath, char* key, PersistenceStorage_e storage, PersistencePolicy_e policy, unsigned char* buffer, unsigned int buffer_size)
{
int write_size = -1;
{
int keySize = 0;
keySize = (int)strlen((const char*)key);
- if(keySize < KeySize)
+ if(keySize < DbKeySize)
{
int dataSize = 0;
dataSize = (int)strlen( (const char*)buffer);
- if(dataSize < ValueSize)
+ if(dataSize < DbValueSize)
{
- memset(insert.m_key, 0, KeySize);
+ // key
+ memset(insert.m_key, 0, DbKeySize);
memcpy(insert.m_key, key, keySize);
if(itzam_true == itzam_btree_find(btree, key, &insert))
{
// key already available, so delete "old" key
state = itzam_btree_remove(btree, (const void *)&insert);
}
- memset(insert.m_data, 0, ValueSize);
+
+ // data
+ memset(insert.m_data, 0, DbValueSize);
memcpy(insert.m_data, buffer, dataSize);
+
+ // data size
+ insert.m_data_size = buffer_size;
+
state = itzam_btree_insert(btree,(const void *)&insert);
if (state != ITZAM_OKAY)
{
- fprintf(stderr, "\nInsert Itzam problem: %s\n", STATE_MESSAGES[state]);
+ fprintf(stderr, "\npersistence_set_data ==> Insert Itzam problem: %s\n", STATE_MESSAGES[state]);
+ write_size = EPERS_DB_ERROR_INTERNAL;
}
}
else
{
- fprintf(stderr, "\nset_value_to_table_itzam => data to long » size %d | maxSize: %d\n", dataSize, KeySize);
+ fprintf(stderr, "\npersistence_set_data ==> set_value_to_table_itzam => data to long » size %d | maxSize: %d\n", dataSize, DbKeySize);
+ write_size = EPERS_DB_VALUE_SIZE;
}
//
}
else
{
- fprintf(stderr, "\nset_value_to_table_itzam => key to long » size: %d | maxSize: %d\n", keySize, KeySize);
+ fprintf(stderr, "\nset_value_to_table_itzam => key to long » size: %d | maxSize: %d\n", keySize, DbKeySize);
+ write_size = EPERS_DB_KEY_SIZE;
}
}
else
{
write_size = EPERS_NOPRCTABLE;
- fprintf(stderr, "\nOpen Itzam problem: %s\n", STATE_MESSAGES[state]);
+ fprintf(stderr, "\npersistence_set_data ==> Open Itzam problem: %s\n", STATE_MESSAGES[state]);
}
}
else if(PersistenceStorage_custom == storage) // custom storage implementation via custom library
if(btree != NULL)
{
keySize = (int)strlen((const char*)key);
- if(keySize < KeySize)
+ if(keySize < DbKeySize)
{
- memset(search.m_key,0, KeySize);
+ memset(search.m_key,0, DbKeySize);
memcpy(search.m_key, key, keySize);
if(itzam_true == itzam_btree_find(btree, key, &search))
{
read_size = EPERS_NOKEY;
}
}
+ else
+ {
+ fprintf(stderr, "persistence_get_data_size => key to long » size: %d | maxSize: %d\n", keySize, DbKeySize);
+ read_size = EPERS_DB_KEY_SIZE;
+ }
//
// workaround till lifecycle is working correctly
//
else
{
read_size = EPERS_NOPRCTABLE;
- fprintf(stderr, "\nOpen Itzam problem: %s\n", STATE_MESSAGES[state]);
+ fprintf(stderr, "\npersistence_get_data_size ==> Open Itzam problem: %s\n", STATE_MESSAGES[state]);
}
}
else if(PersistenceStorage_custom == storage) // custom storage implementation via custom library
{
int keySize = 0;
keySize = (int)strlen((const char*)dbKey);
- if(keySize < KeySize)
+ if(keySize < DbKeySize)
{
itzam_state state;
- memset(delete.m_key,0, KeySize);
+ memset(delete.m_key,0, DbKeySize);
memcpy(delete.m_key, dbKey, keySize);
state = itzam_btree_remove(btree, (const void *)&delete);
if (state != ITZAM_OKAY)
{
- fprintf(stderr, "Remove Itzam problem: %s\n", STATE_MESSAGES[state]);
+ fprintf(stderr, "persistence_delete_data ==> Remove Itzam problem: %s\n", STATE_MESSAGES[state]);
+ ret = EPERS_DB_ERROR_INTERNAL;
}
}
else
{
- fprintf(stderr, "persistence_delete_data => key to long » size: %d | maxSize: %d\n", keySize, KeySize);
+ fprintf(stderr, "persistence_delete_data => key to long » size: %d | maxSize: %d\n", keySize, DbKeySize);
+ ret = EPERS_DB_KEY_SIZE;
}
//
// workaround till lifecycle is working correctly
{
int handle = 0;
- if(gInitialized == 0)
- {
- gInitialized = 1;
- pthread_mutex_init(&gMtx, 0);
- }
-
if(pthread_mutex_lock(&gMtx) == 0)
{
if(gFreeCursorHandleIdxHead > 0) // check if we have a free spot in the array before the current max
}
pthread_mutex_unlock(&gMtx);
}
-
return handle;
}
int handle = -1;
itzam_btree* btree = NULL;
- printf("CREATE-Cursor: %d | path: %s \n", (int)storage, dbPath);
+ //printf("CREATE-Cursor: %d | path: %s \n", (int)storage, dbPath);
btree = database_get(storage, policy, dbPath);
if(btree != NULL)
{
}
}
}
-
return handle;
}
-int persistence_db_cursor_next(int handlerDB)
+int persistence_db_cursor_next(unsigned int handlerDB)
{
int rval = -1;
if(handlerDB < maxPersHandle && handlerDB >= 0)
}
else
{
- printf("persistence_db_cursor_get_key ==> invalid handle: %d \n", handlerDB);
+ printf("persistence_db_cursor_get_key ==> invalid handle: %u \n", handlerDB);
}
}
else
{
- printf("persistence_db_cursor_get_key ==> handle bigger than max » handleDB: %d | max: : %d \n", handlerDB, maxPersHandle);
+ printf("persistence_db_cursor_get_key ==> handle bigger than max » handleDB: %u | max: : %d \n", handlerDB, maxPersHandle);
}
-
return rval;
}
-int persistence_db_cursor_get_key(int handlerDB, char * bufKeyName_out, int bufSize)
+int persistence_db_cursor_get_key(unsigned int handlerDB, char * bufKeyName_out, int bufSize)
{
int rval = -1;
KeyValuePair_s search;
- if(handlerDB < maxPersHandle && handlerDB >= 0)
+ if(handlerDB < maxPersHandle)
{
if(gCursorArray[handlerDB].m_empty != 1)
{
}
else
{
- printf("persistence_db_cursor_get_key ==> invalid handle: %d \n", handlerDB);
+ printf("persistence_db_cursor_get_key ==> invalid handle: %u \n", handlerDB);
}
}
else
{
- printf("persistence_db_cursor_get_key ==> handle bigger than max » handleDB: %d | max: : %d \n", handlerDB, maxPersHandle);
+ printf("persistence_db_cursor_get_key ==> handle bigger than max » handleDB: %u | max: : %d \n", handlerDB, maxPersHandle);
}
-
return rval;
}
-int persistence_db_cursor_get_data(int handlerDB, char * bufData_out, int bufSize)
+int persistence_db_cursor_get_data(unsigned int handlerDB, char * bufData_out, int bufSize)
{
int rval = -1;
KeyValuePair_s search;
- if(handlerDB < maxPersHandle && handlerDB >= 0)
+ if(handlerDB < maxPersHandle)
{
if(gCursorArray[handlerDB].m_empty != 1)
{
}
else
{
- printf("persistence_db_cursor_get_data ==> invalid handle: %d \n", handlerDB);
+ printf("persistence_db_cursor_get_data ==> invalid handle: %u \n", handlerDB);
}
}
else
{
- printf("persistence_db_cursor_get_data ==> handle bigger than max » handleDB: %d | max: : %d \n", handlerDB, maxPersHandle);
+ printf("persistence_db_cursor_get_data ==> handle bigger than max » handleDB: %u | max: : %d \n", handlerDB, maxPersHandle);
}
-
return rval;
}
-int persistence_db_cursor_get_data_size(int handlerDB)
+int persistence_db_cursor_get_data_size(unsigned int handlerDB)
{
int size = -1;
KeyValuePair_s search;
- if(handlerDB < maxPersHandle && handlerDB >= 0)
+ if(handlerDB < maxPersHandle)
{
if(gCursorArray[handlerDB].m_empty != 1)
{
}
else
{
- printf("persistence_db_cursor_get_data ==> invalid handle: %d \n", handlerDB);
+ printf("persistence_db_cursor_get_data ==> invalid handle: %u \n", handlerDB);
}
}
else
{
- printf("persistence_db_cursor_get_data ==> handle bigger than max » handleDB: %d | max: : %d \n", handlerDB, maxPersHandle);
+ printf("persistence_db_cursor_get_data ==> handle bigger than max » handleDB: %u | max: : %d \n", handlerDB, maxPersHandle);
}
-
return size;
}
-int persistence_db_cursor_destroy(int handlerDB)
+int persistence_db_cursor_destroy(unsigned int handlerDB)
{
int rval = -1;
itzam_state state;
- state = itzam_btree_cursor_free(&gCursorArray[handlerDB].m_cursor);
- if (state == ITZAM_OKAY)
+ if(handlerDB < maxPersHandle)
{
- rval = 0;
- database_close(gCursorArray[handlerDB].storage, gCursorArray[handlerDB].policy);
+ state = itzam_btree_cursor_free(&gCursorArray[handlerDB].m_cursor);
+ if (state == ITZAM_OKAY)
+ {
+ rval = 0;
+ database_close(gCursorArray[handlerDB].storage, gCursorArray[handlerDB].policy);
- gCursorArray[handlerDB].m_empty = 1;
- gCursorArray[handlerDB].storage = PersistenceStoragePolicy_LastEntry;
- gCursorArray[handlerDB].policy = PersistencePolicy_LastEntry;
+ gCursorArray[handlerDB].m_empty = 1;
+ gCursorArray[handlerDB].storage = PersistenceStoragePolicy_LastEntry;
+ gCursorArray[handlerDB].policy = PersistencePolicy_LastEntry;
- close_cursor_handle(handlerDB);
+ close_cursor_handle(handlerDB);
+ }
}
-
return rval;
}
* Company XS Embedded GmbH
*****************************************************************************/
/******************************************************************************
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
- OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 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/.
******************************************************************************/
/**
* @file persistence_client_library_data_access.h
* EPERS_SETDTAFAILED EPERS_NOPRCTABLE EPERS_NOKEYDATA EPERS_NOKEY
*/
int persistence_set_data(char* dbPath, char* key, PersistenceStorage_e storage, PersistencePolicy_e policy,
- unsigned char* buffer, unsigned long buffer_size);
+ unsigned char* buffer, unsigned int buffer_size);
* @param dbPath the path to the database where the key is in
* @param key the database key
* @param storage the storage identifier (local, shared or custom)
+ * @param policy the storage policy (cached or write throug)
+ * @param buffer the buffer holding the data
+ * @param buffer_size the size of the buffer
*
* @return the number of bytes read or a negative value if an error occured with the following error codes:
* EPERS_NOPRCTABLE EPERS_NOKEYDATA EPERS_NOKEY
*/
int persistence_get_data(char* dbPath, char* key, PersistenceStorage_e storage, PersistencePolicy_e policy,
- unsigned char* buffer, unsigned long buffer_size);
+ unsigned char* buffer, unsigned int buffer_size);
* @param dbPath the path to the database where the key is in
* @param key the database key
* @param storage the storage identifier (local, shared or custom)
+ * @param policy the storage policy (cached or write throug)
*
* @return size of data in bytes read from the key or on error a negative value with the following error codes:
* EPERS_NOPRCTABLE or EPERS_NOKEY
/**
* @brief delete data
+ *
+ * @param dbPath the path to the database where the key is in
+ * @param key the database key to register on
+ *
+ * @return 0 if deletion was successfull;
+ * or an error code: EPERS_DB_KEY_SIZE, EPERS_NOPRCTABLE, EPERS_DB_ERROR_INTERNAL or EPERS_NOPLUGINFUNCT
*/
int persistence_delete_data(char* dbPath, char* dbKey, PersistenceStorage_e storage, PersistencePolicy_e policy);
*
* @return 0 for success, negative value in case of error (check against EPERS_LAST_ENTRY_IN_DB)
*/
-int persistence_db_cursor_next(int handlerDB);
+int persistence_db_cursor_next(unsigned int handlerDB);
/**
* @brief get the name of the key pointed by the cursor associated with the database
*
* @return read size (if >= 0), error other way
*/
-int persistence_db_cursor_get_key(int handlerDB, char * bufKeyName_out, int bufSize) ;
+int persistence_db_cursor_get_key(unsigned int handlerDB, char * bufKeyName_out, int bufSize) ;
/**
* @brief get the data of the key pointed by the cursor associated with the database
*
* @return read size (if >= 0), error other way
*/
-int persistence_db_cursor_get_data(int handlerDB, char * bufData_out, int bufSize) ;
+int persistence_db_cursor_get_data(unsigned int handlerDB, char * bufData_out, int bufSize) ;
/**
* @brief get the data size of the key pointed by the cursor associated with the database
*
* @return positive value for data size, negative value for error
*/
-int persistence_db_cursor_get_data_size(int handlerDB) ;
+int persistence_db_cursor_get_data_size(unsigned int handlerDB) ;
/**
*
* @return 0 for success, negative value in case of error
*/
-int persistence_db_cursor_destroy(int handlerDB) ;
+int persistence_db_cursor_destroy(unsigned int handlerDB) ;
#endif /* PERSISTENCY_CLIENT_LIBRARY_DATA_ACCESS_H */
* Company XS Embedded GmbH
*****************************************************************************/
/******************************************************************************
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
- OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 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/.
******************************************************************************/
/**
* @file persistence_client_library_dbus_service.c
#include <stdlib.h>
+pthread_mutex_t gDbusInitializedMtx = PTHREAD_MUTEX_INITIALIZER;
+pthread_cond_t gDbusInitializedCond = PTHREAD_COND_INITIALIZER;
+
/// polling structure
typedef struct SPollInfo
{
void* run_mainloop(void* dataPtr)
{
- printf(" *** run_mainloop ==> pthread_mutex_lock => \n");
- // lock mutex to make sure dbus main loop is running
- //pthread_mutex_lock(&gDbusInitializedMtx);
- printf(" *** run_mainloop ==> pthread_mutex_lock <= \n");
-
// persistence admin message
static const struct DBusObjectPathVTable vtablePersAdmin
= {unregisterMessageHandler, checkPersAdminMsg, NULL, };
= {unregisterObjectPathFallback, handleObjectPathMessageFallback, NULL, };
// setup the dbus
- printf(" *** run_mainloop ==> mainLoop\n");
mainLoop(vtablePersAdmin, vtableLifecycle, vtableFallback, dataPtr);
printf("Exit dbus main loop!!!!\n");
gDbusConn = dbus_bus_get(DBUS_BUS_SYSTEM, &err);
}
- printf(" *** setup_dbus_mainloop ==> pthread_create\n");
+ // wain until dbus main loop has been setup and running
+ pthread_mutex_lock(&gDbusInitializedMtx);
+
// create here the dbus connection and pass to main loop
rval = pthread_create(&thread, NULL, run_mainloop, gDbusConn);
-
- if (rval)
+ if(rval)
{
fprintf(stderr, "Server: - ERROR! pthread_create( run_mainloop ) returned: %d\n", rval);
}
+
+ // wait for condition variable
+ pthread_cond_wait(&gDbusInitializedCond, &gDbusInitializedMtx);
+
+ pthread_mutex_unlock(&gDbusInitializedMtx);
return rval;
}
DBusObjectPathVTable vtableFallback, void* userData)
{
DBusError err;
+ // lock mutex to make sure dbus main loop is running
+ pthread_mutex_lock(&gDbusInitializedMtx);
signal(SIGTERM, sigHandler);
signal(SIGQUIT, sigHandler);
signal(SIGINT, sigHandler);
DBusConnection* conn = (DBusConnection*)userData;
-
dbus_error_init(&err);
if (dbus_error_is_set(&err))
gPollInfo.fds[0].fd = gPipefds[0];
gPollInfo.fds[0].events = POLLIN;
-// dbus_bus_add_match(conn, "type='signal', sender='org.genivi.persistence.admin',interface='org.genivi.persistence.admin',member='PersistenceModeChanged',path='/org/genivi/persistence/admin'", &err);
-// dbus_connection_add_filter(conn, checkPersAdminSignal, NULL, NULL);
+ dbus_bus_add_match(conn, "type='signal',interface='org.genivi.persistence.admin',member='PersistenceModeChanged',path='/org/genivi/persistence/admin'", &err);
// register for messages
if ( (TRUE==dbus_connection_register_object_path(conn, "/org/genivi/persistence/adminconsumer", &vtable, userData))
&& (TRUE==dbus_connection_register_object_path(conn, "/com/contiautomotive/NodeStateManager/LifecycleConsumer", &vtable2, userData))
&& (TRUE==dbus_connection_register_fallback(conn, "/", &vtableFallback, userData)) )
{
- printf("* * * * mainLoop ==> success: dbus_connection_register_object_path \n");
if (TRUE!=dbus_connection_set_watch_functions(conn, addWatch, removeWatch, watchToggled, NULL, NULL))
{
printf("dbus_connection_set_watch_functions() failed\n");
else
{
char buf[64];
- // mainloop is running now, release mutex
- //pthread_mutex_unlock(&gDbusInitializedMtx);
+
+ pthread_cond_signal(&gDbusInitializedCond);
+ pthread_mutex_unlock(&gDbusInitializedMtx);
do
{
bContinue = 0; /* assume error */
- while (DBUS_DISPATCH_DATA_REMAINS==dbus_connection_dispatch(conn));
+ while(DBUS_DISPATCH_DATA_REMAINS==dbus_connection_dispatch(conn));
- while ((-1==(ret=poll(gPollInfo.fds, gPollInfo.nfds, 500)))&&(EINTR==errno));
+ while((-1==(ret=poll(gPollInfo.fds, gPollInfo.nfds, 500)))&&(EINTR==errno));
if(0>ret)
{
dbus_connection_unregister_object_path(conn, "/com/contiautomotive/NodeStateManager/LifecycleConsumer");
dbus_connection_unregister_object_path(conn, "/");
}
- printf("* * * * mainLoop ==> error: dbus_connection_register_object_path\n");
close(gPipefds[1]);
close(gPipefds[0]);
}
dbus_connection_unref(conn);
dbus_shutdown();
}
+
+ pthread_cond_signal(&gDbusInitializedCond);
+ pthread_mutex_unlock(&gDbusInitializedMtx);
return 0;
}
* Company XS Embedded GmbH
*****************************************************************************/
/******************************************************************************
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
- OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 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/.
******************************************************************************/
/**
* @file persistence_client_library_dbus_service.h
#include <pthread.h>
/// mutex to make sure main loop is running
-pthread_mutex_t gDbusInitializedMtx;
+extern pthread_mutex_t gDbusInitializedMtx;
+extern pthread_cond_t gDbusInitializedCond;
/// command definitions for main loop
* Company XS Embedded GmbH
*****************************************************************************/
/******************************************************************************
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
- OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 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/.
******************************************************************************/
/**
* @file persistence_client_library_file.c
{
int rval = -1;
- rval = close(fd);
if(fd < maxPersHandle)
{
__sync_fetch_and_sub(&gOpenFdArray[fd], FileClosed); // set closed flag
+ rval = close(fd);
}
-
return rval;
}
if(shared_DB != -1) // check valid database context
{
handle = open(dbPath, flags);
-
- if(handle == -1)
- {
- printf("file_open ERROR: %s \n", strerror(errno) );
- }
- else
+ if(handle != -1)
{
if(handle < maxPersHandle)
{
}
else
{
+ close(handle);
handle = EPERS_MAXHANDLE;
}
}
+ else
+ {
+ printf("file_open ERROR: %s \n", strerror(errno) );
+ }
}
return handle;
-int file_read_data(int fd, void * buffer, unsigned long buffer_size)
+int file_read_data(int fd, void * buffer, int buffer_size)
{
return read(fd, buffer, buffer_size);
}
-int file_write_data(int fd, const void * buffer, unsigned long buffer_size)
+int file_write_data(int fd, const void * buffer, int buffer_size)
{
int size = 0;
* Company XS Embedded GmbH
*****************************************************************************/
/******************************************************************************
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
- OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 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/.
******************************************************************************/
/**
* @file persistence_client_library_handle.c
#include "persistence_client_library_handle.h"
+#include <pthread.h>
#include <stdlib.h>
/// handle index
* Company XS Embedded GmbH
*****************************************************************************/
/******************************************************************************
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
- OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 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/.
******************************************************************************/
/**
* @file persistence_client_library_handle.h
* @see
*/
-static const char * ERROR_STRINGS [] =
-{
- "invalid datafile signature",
- "invalid version",
- "can not open 64-bit datafile on 32-bit operating system",
- "write failed",
- "open failed",
- "read failed",
- "close failed",
- "seek failed",
- "tell failed",
- "duplicate remove",
- "flush failed",
- "rewrite record too small",
- "page not found",
- "lost key",
- "key not written",
- "key seek failed",
- "unable to remove key record",
- "record seek failed",
- "unable to remove data record",
- "list of deleted records could not be read",
- "list of deleted records could not be written",
- "iterator record count differs from database internal count",
- "rewrite over deleted record",
- "invalid column index",
- "invalid row index",
- "invalid hash value",
- "memory allocation failed",
- "attempt reading deleted record",
- "invalid record signature found",
- "invalid file locking mode",
- "unable to lock datafile",
- "unable to unlock datafile",
- "size mismatch when reading record",
- "attempt to start new transaction while one is already active",
- "no transaction active",
- "attempt to free a B-tree cursor when cursors were active",
- "invalid datafile object",
- "size_t is incompatible with Itzam",
- "could not create datafile",
- "global shared memory requires Administrator or user with SeCreateGlobalPrivilege",
- "cannot create global shared memory",
- "another process or thread has already created shared objects for this datafile",
- "invalid operation for read only file"
-};
-
-static const char * STATE_MESSAGES [] =
-{
- "okay",
- "operation failed",
- "version mismatch in files",
- "iterator at end",
- "iterator at beginning",
- "key not found",
- "duplicate key",
- "exceeded maximum file size on 32-bit system",
- "unable to write data record for index",
- "sizeof(size_t) smaller than required for file references; possibly 64-bit DB on 32-bit platform",
- "invalid operation for read only file"
-};
+#include <itzam.h>
+
+/// error string messages definition
+extern const char * ERROR_STRINGS [];
+
+/// error state messages definition
+extern const char * STATE_MESSAGES [];
+
+/// error handler
+void error_handler(const char * function_name, itzam_error error);
+
#endif /* PERSISTENCE_CLIENT_ITZAM_ERRORS_H */
* Company XS Embedded GmbH
*****************************************************************************/
/******************************************************************************
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
- OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 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/.
******************************************************************************/
/**
* @file persistence_client_library_key.c
handle = get_db_context(&dbContext, resource_id, resIsNoFile, dbKey, dbPath);
if(handle >= 0)
{
- if( dbContext.storage >= PersistenceStorage_local
- && dbContext.storage < PersistenceStoragePolicy_LastEntry) // check if store policy is valid
+ if(dbContext.storage < PersistenceStoragePolicy_LastEntry) // check if store policy is valid
{
if(PersistenceStorage_custom == dbContext.storage)
{
-int key_handle_read_data(int key_handle, unsigned char* buffer, unsigned long buffer_size)
+int key_handle_read_data(int key_handle, unsigned char* buffer, int buffer_size)
{
int size = 0;
if(key_handle < maxPersHandle)
-int key_handle_write_data(int key_handle, unsigned char* buffer, unsigned long buffer_size)
+int key_handle_write_data(int key_handle, unsigned char* buffer, int buffer_size)
{
int size = 0;
// status: OK
int key_read_data(unsigned char ldbid, char* resource_id, unsigned char user_no, unsigned char seat_no,
- unsigned char* buffer, unsigned long buffer_size)
+ unsigned char* buffer, int buffer_size)
{
int data_size = 0;
int key_write_data(unsigned char ldbid, char* resource_id, unsigned char user_no, unsigned char seat_no,
- unsigned char* buffer, unsigned long buffer_size)
+ unsigned char* buffer, int buffer_size)
{
int data_size = 0;
* Company XS Embedded GmbH
*****************************************************************************/
/******************************************************************************
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
- OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 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/.
******************************************************************************/
/**
* @file persistence_client_library_lc_interface.c
#include "persistence_client_library_custom_loader.h"
#include "persistence_client_library_access_helper.h"
#include "persistence_client_library_data_access.h"
+#include "persistence_client_library_itzam_errors.h"
#include <errno.h>
#include <stdio.h>
void process_prepare_shutdown(unsigned char requestId)
{
int i = 0;
- GvdbTable* resourceTable = NULL;
+ //GvdbTable* resourceTable = NULL;
+ itzam_btree* resourceTable = NULL;
+ itzam_state state = ITZAM_FAILED;
// block write
pers_lock_access();
// flush open files to disk
for(i=0; i<maxPersHandle; i++)
{
- if(gOpenFdArray[i] == FileOpen)
+ int tmp = i;
+ if(gOpenFdArray[tmp] == FileOpen)
{
- fsync(i);
- close(i);
+ fsync(tmp);
+ close(tmp);
}
}
// dereference opend database
if(resourceTable != NULL)
{
- gvdb_table_unref(resourceTable);
+ state = itzam_btree_close(resourceTable);
+ if (state != ITZAM_OKAY)
+ {
+ fprintf(stderr, "\nOpen Itzam problem: %s\n", STATE_MESSAGES[state]);
+ }
}
}
* Company XS Embedded GmbH
*****************************************************************************/
/******************************************************************************
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
- OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 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/.
******************************************************************************/
/**
* @file persistence_client_library_lc_interface.h
* Company XS Embedded GmbH
*****************************************************************************/
/******************************************************************************
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
- OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 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/.
******************************************************************************/
/**
* @file persistence_client_library_pas_interface.c
DBusHandlerResult msg_persAdminRequest(DBusConnection *connection, DBusMessage *message)
{
- int request = 0, requestID = 0;
- int errorCode = 0;
+ int request = 0, requestID = 0, errorCode = 0;
+ int errorReturn = 0;
DBusMessage *reply;
DBusError error;
if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT32 , &request,
DBUS_TYPE_INT32 , &requestID,
+ DBUS_TYPE_INT32 , &errorCode,
DBUS_TYPE_INVALID))
{
reply = dbus_message_new_error(message, error.name, error.message);
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
- errorCode = check_pas_request(request, requestID);
+ errorReturn = check_pas_request(request, requestID);
reply = dbus_message_new_method_return(message);
printf("DBus No memory\n");
}
- if (!dbus_message_append_args(reply, DBUS_TYPE_INT32, &errorCode, DBUS_TYPE_INVALID))
+ if (!dbus_message_append_args(reply, DBUS_TYPE_INT32, &errorReturn, DBUS_TYPE_INVALID))
{
//DLT_LOG(mgrContext, DLT_LOG_ERROR, DLT_STRING("DBus No memory"));
printf("DBus No memory\n");
int send_pas_register(const char* method, int notificationFlag)
{
- int rval = 0;
+ int rval = 0, errorCode = 0;
DBusError error;
dbus_error_init (&error);
"/org/genivi/persistence/admin", // path
"org.genivi.persistence.admin", // interface
method); // method
+
if(message != NULL)
{
dbus_message_append_args(message, DBUS_TYPE_STRING, &busName, // bus name
DBUS_TYPE_STRING, &objName,
- DBUS_TYPE_INT32, ¬ificationFlag,
- DBUS_TYPE_INT32, &gTimeoutMs,
+ DBUS_TYPE_INT32, ¬ificationFlag,
+ DBUS_TYPE_UINT32, &gTimeoutMs,
+ DBUS_TYPE_INT32, &errorCode,
DBUS_TYPE_INVALID);
if(conn != NULL)
int send_pas_request(const char* method, unsigned int requestID, int status)
{
- int rval = 0;
+ int rval = 0, errorCode = 0;
DBusError error;
dbus_error_init (&error);
{
dbus_message_append_args(message, DBUS_TYPE_UINT32, &requestID,
DBUS_TYPE_INT32, &status,
+ DBUS_TYPE_INT32, &errorCode,
DBUS_TYPE_INVALID);
if(conn != NULL)
* Company XS Embedded GmbH
*****************************************************************************/
/******************************************************************************
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
- OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 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/.
******************************************************************************/
/**
* @file persistence_client_library_pas_interface.h
* Company XS Embedded GmbH
*****************************************************************************/
/******************************************************************************
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
- OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 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/.
******************************************************************************/
/**
* @file persistence_client_library_dbus_test.c
* Company XS Embedded GmbH
*****************************************************************************/
/******************************************************************************
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
- OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 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/.
******************************************************************************/
/**
* @file persistence_client_library_test.c
memset(buffer, 0, READ_SIZE);
ret = key_read_data(0, "language/current_language", 3, 0, buffer, READ_SIZE);
- printf("Buffer: %s \n", buffer);
fail_unless(strncmp((char*)buffer, "CACHE_ Kisuaheli", strlen((char*)buffer)) == 0, "Buffer not correctly read");
memset(buffer, 0, READ_SIZE);
snprintf(sysTimeBuffer, 128, "TimeAndData: \"%s %d.%d.%d - %d:%.2d:%.2d Uhr\"", dayOfWeek[locTime->tm_wday], locTime->tm_mday, locTime->tm_mon, (locTime->tm_year+1900),
locTime->tm_hour, locTime->tm_min, locTime->tm_sec);
// open handle ---------------------------------------------------
- handle = key_handle_open(0xFF, "posHandle/last_position", 0, 0);
- fail_unless(handle >= 0, "Failed to open handle ==> /posHandle/last position");
+ handle = key_handle_open(0xFF, "posHandle/last_position", 1, 0);
+ printf("Handle: %d\n", handle);
+ fail_unless(handle >= 0, "Failed to open handle ==> /posHandle/last_position");
ret = key_handle_read_data(handle, buffer, READ_SIZE);
fail_unless(strncmp((char*)buffer, "WT_ H A N D L E: +48° 10' 38.95\", +8° 44' 39.06\"", ret-1) == 0, "Buffer not correctly read");
// write data
snprintf(sysTimeBuffer, 128, "\"%s %d.%d.%d - %d:%.2d:%.2d Uhr\"", dayOfWeek[locTime->tm_wday], locTime->tm_mday, locTime->tm_mon, (locTime->tm_year+1900),
locTime->tm_hour, locTime->tm_min, locTime->tm_sec);
+
ret = key_write_data(0xFF, "69", 1, 2, (unsigned char*)sysTimeBuffer, strlen(sysTimeBuffer));
fail_unless(ret == strlen(sysTimeBuffer), "Wrong write size");
// create cursor
handle = persistence_db_cursor_create("/Data/mnt-c/lt-persistence_client_library_test/cached.itz",
PersistenceStorage_local, PersistencePolicy_wc);
- printf("Handle : %d \n", handle);
+
fail_unless(handle != -1, "Failed to create cursor!!");
// create cursor
handle1 = persistence_db_cursor_create("/Data/mnt-c/lt-persistence_client_library_test/wt.itz",
PersistenceStorage_local, PersistencePolicy_wt);
- printf("Handle1 : %d \n", handle1);
+
fail_unless(handle1 != -1, "Failed to create cursor!!");
do
projects / profile / ivi / persistence-client-library.git / commitdiff