summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngo Huerner <ingo.huerner@xse.de>2013-11-04 15:31:51 +0100
committerIngo Huerner <ingo.huerner@xse.de>2013-11-04 15:31:51 +0100
commit3d40616d7cb9acb4a2b18906ee6ee1fa505ef34b (patch)
tree4e1998dd3e00ff57c9d6d3e0d7dc9151faa51820
parentacdf21cadc3a942b47f154c1964151f6a1883ddc (diff)
downloadpersistence-client-library-3d40616d7cb9acb4a2b18906ee6ee1fa505ef34b.tar.gz
Adjusted library version information; added define for non shutdown notifications for pclInitLibrary
-rw-r--r--configure.ac6
-rw-r--r--include/persistence_client_library.h8
-rw-r--r--include/persistence_client_library_key.h3
-rw-r--r--src/persistence_client_library.c11
4 files changed, 18 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac
index 205a8b1..27f7587 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
# create tag version information
m4_define([pers_client_library_tag_version_major], [0])
-m4_define([pers_client_library_tag_version_minor], [7])
+m4_define([pers_client_library_tag_version_minor], [8])
m4_define([pers_client_library_tag_version_micro], [0])
m4_define([pers_client_library_tag_version], [pers_client_library_tag_version_major().pers_client_library_tag_version_minor().pers_client_library_tag_version_micro()])
@@ -16,8 +16,8 @@ AC_GNU_SOURCE()
# create library version information
-m4_define([pers_client_library_version_current], [6])
-m4_define([pers_client_library_version_revision], [2])
+m4_define([pers_client_library_version_current], [7])
+m4_define([pers_client_library_version_revision], [0])
m4_define([pers_client_library_version_age], [0])
m4_define([pers_client_library_version], [pers_client_library_version_current():pers_client_library_version_revision():pers_client_library_version_age()])
diff --git a/include/persistence_client_library.h b/include/persistence_client_library.h
index 8db005f..dbddfe8 100644
--- a/include/persistence_client_library.h
+++ b/include/persistence_client_library.h
@@ -20,6 +20,7 @@
* \par change history
* Date Author Version
* 25/06/13 Ingo Hürner 1.0.0 - Rework of Init functions
+ * 04/11/13 Ingo Hürner 2.0.0 - Added define for shutdown type none
*
*/
/** \ingroup GEN_PERS */
@@ -38,7 +39,7 @@ extern "C" {
* \{
*/
-#define PERSIST_API_INTERFACE_VERSION (0x01020000U)
+#define PERSIST_API_INTERFACE_VERSION (0x01030000U)
/** \} */
@@ -51,10 +52,12 @@ extern "C" {
#define PCL_SHUTDOWN_TYPE_FAST 2 /// Client registered for fast lifecycle shutdown
#define PCL_SHUTDOWN_TYPE_NORMAL 1 /// Client registered for normal lifecycle shutdown
+#define PCL_SHUTDOWN_TYPE_NONE 0 /// Client does not register to lifecycle shutdown
/**
- * @brief initalize client library
+ * @brief initalize client library.
+ * This function will be called by the process using the PCL during startup phase.
*
* @attention This function is currently N O T part of the GENIVI compliance specification
*
@@ -70,6 +73,7 @@ int pclInitLibrary(const char* appname, int shutdownMode);
/**
* @brief deinitialize client library
+ * This function will be called during the shutdown phase of the process which uses the PCL.
*
* @attention This function is currently N O T part of the GENIVI compliance specification
*
diff --git a/include/persistence_client_library_key.h b/include/persistence_client_library_key.h
index 42bfd98..649b449 100644
--- a/include/persistence_client_library_key.h
+++ b/include/persistence_client_library_key.h
@@ -22,6 +22,7 @@
* 27/03/13 Ingo Hürner 4.0.0 - Add registration for callback notification
* 28/05/13 Ingo Hürner 5.0.0 - Add pclInitLibrary(), pcl DeInitLibrary() incl. shutdown notification
* 05/06/13 Oliver Bach 6.0.0 - Rework of Init functions
+ * 04/11/13 Ingo Hürner 7.0.0 - Added functions to unregister notifications
*/
/** \ingroup GEN_PERS */
/** \defgroup PERS_KEYVALUE Client: Key-value access
@@ -39,7 +40,7 @@ extern "C" {
* \{
*/
-#define PERSIST_KEYVALUEAPI_INTERFACE_VERSION (0x06010000U)
+#define PERSIST_KEYVALUEAPI_INTERFACE_VERSION (0x06020000U)
#include "persistence_client_library.h"
diff --git a/src/persistence_client_library.c b/src/persistence_client_library.c
index c162a0d..7fb8895 100644
--- a/src/persistence_client_library.c
+++ b/src/persistence_client_library.c
@@ -92,11 +92,14 @@ int pclInitLibrary(const char* appName, int shutdownMode)
return EPERS_DBUS_MAINLOOP;
}
- // register for lifecycle and persistence admin service dbus messages
- if(register_lifecycle(shutdownMode) == -1)
+ if(gShutdownMode != PCL_SHUTDOWN_TYPE_NONE)
{
- DLT_LOG(gDLTContext, DLT_LOG_ERROR, DLT_STRING("pclInitLibrary => Failed to register to lifecycle dbus interface"));
- return EPERS_REGISTER_LIFECYCLE;
+ // register for lifecycle and persistence admin service dbus messages
+ if(register_lifecycle(shutdownMode) == -1)
+ {
+ DLT_LOG(gDLTContext, DLT_LOG_ERROR, DLT_STRING("pclInitLibrary => Failed to register to lifecycle dbus interface"));
+ return EPERS_REGISTER_LIFECYCLE;
+ }
}
if(register_pers_admin_service() == -1)
{