X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=include%2Fafb%2Fafb-daemon-v1.h;h=5a78b15d68023303ac26f12c6a97d37841de7aa2;hb=a708fcbcb234af8ffe69d04786e44472b45f3559;hp=84095e040691ac1ccda85756292ea741ec82b2d6;hpb=95c29ef579d6320a721f96d7146efd10f74a201b;p=src%2Fapp-framework-binder.git

diff --git a/include/afb/afb-daemon-v1.h b/include/afb/afb-daemon-v1.h
index 84095e04..5a78b15d 100644
--- a/include/afb/afb-daemon-v1.h
+++ b/include/afb/afb-daemon-v1.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016, 2017 "IoT.bzh"
+ * Copyright (C) 2016, 2017, 2018 "IoT.bzh"
  * Author: José Bollo <jose.bollo@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <stdarg.h>
+#include "afb-daemon-itf.h"
 
 /*
  * Retrieves the common systemd's event loop of AFB
@@ -55,6 +55,8 @@ static inline struct sd_bus *afb_daemon_get_system_bus_v1(struct afb_daemon daem
  * Thus, in the case where 'object' should remain available after
  * the function returns, the function 'json_object_get' shall be used.
  *
+ * Calling this function is only forbidden during preinit.
+ *
  * Returns the count of clients that received the event.
  */
 static inline int afb_daemon_broadcast_event_v1(struct afb_daemon daemon, const char *name, struct json_object *object)
@@ -65,6 +67,10 @@ static inline int afb_daemon_broadcast_event_v1(struct afb_daemon daemon, const
 /*
  * Creates an event of 'name' and returns it.
  * 'daemon' MUST be the daemon given in interface when activating the binding.
+ *
+ * Calling this function is only forbidden during preinit.
+ *
+ * See afb_event_is_valid to check if there is an error.
  */
 static inline struct afb_event afb_daemon_make_event_v1(struct afb_daemon daemon, const char *name)
 {
@@ -74,8 +80,21 @@ static inline struct afb_event afb_daemon_make_event_v1(struct afb_daemon daemon
 /*
  * Send a message described by 'fmt' and following parameters
  * to the journal for the verbosity 'level'.
- * 'file' and 'line' are indicators of position of the code in source files.
+ *
+ * 'file' and 'line' are indicators of position of the code in source files
+ * (see macros __FILE__ and __LINE__).
+ *
  * 'daemon' MUST be the daemon given in interface when activating the binding.
+ *
+ * 'level' is defined by syslog standard:
+ *      EMERGENCY         0        System is unusable
+ *      ALERT             1        Action must be taken immediately
+ *      CRITICAL          2        Critical conditions
+ *      ERROR             3        Error conditions
+ *      WARNING           4        Warning conditions
+ *      NOTICE            5        Normal but significant condition
+ *      INFO              6        Informational
+ *      DEBUG             7        Debug-level messages
  */
 static inline void afb_daemon_verbose_v1(struct afb_daemon daemon, int level, const char *file, int line, const char *fmt, ...) __attribute__((format(printf, 5, 6)));
 static inline void afb_daemon_verbose_v1(struct afb_daemon daemon, int level, const char *file, int line, const char *fmt, ...)
@@ -86,6 +105,34 @@ static inline void afb_daemon_verbose_v1(struct afb_daemon daemon, int level, co
 	va_end(args);
 }
 
+/*
+ * Send a message described by 'fmt' and following parameters
+ * to the journal for the verbosity 'level'.
+ *
+ * 'file', 'line' and 'func' are indicators of position of the code in source files
+ * (see macros __FILE__, __LINE__ and __func__).
+ *
+ * 'daemon' MUST be the daemon given in interface when activating the binding.
+ *
+ * 'level' is defined by syslog standard:
+ *      EMERGENCY         0        System is unusable
+ *      ALERT             1        Action must be taken immediately
+ *      CRITICAL          2        Critical conditions
+ *      ERROR             3        Error conditions
+ *      WARNING           4        Warning conditions
+ *      NOTICE            5        Normal but significant condition
+ *      INFO              6        Informational
+ *      DEBUG             7        Debug-level messages
+ */
+static inline void afb_daemon_verbose2_v1(struct afb_daemon daemon, int level, const char *file, int line, const char *func, const char *fmt, ...) __attribute__((format(printf, 6, 7)));
+static inline void afb_daemon_verbose2_v1(struct afb_daemon daemon, int level, const char *file, int line, const char *func, const char *fmt, ...)
+{
+	va_list args;
+	va_start(args, fmt);
+	daemon.itf->vverbose_v2(daemon.closure, level, file, line, func, fmt, args);
+	va_end(args);
+}
+
 /*
  * Get the root directory file descriptor. This file descriptor can
  * be used with functions 'openat', 'fstatat', ...
@@ -122,3 +169,35 @@ static inline int afb_daemon_queue_job_v1(struct afb_daemon daemon, void (*callb
 {
 	return daemon.itf->queue_job(daemon.closure, callback, argument, group, timeout);
 }
+
+/*
+ * Tells that it requires the API of "name" to exist
+ * and if 'initialized' is not null to be initialized.
+ * Calling this function is only allowed within init.
+ * Returns 0 in case of success or -1 in case of error.
+ */
+static inline int afb_daemon_require_api_v1(struct afb_daemon daemon, const char *name, int initialized)
+{
+	return daemon.itf->require_api(daemon.closure, name, initialized);
+}
+
+/*
+ * Set the name of the API to 'name'.
+ * Calling this function is only allowed within preinit.
+ * Returns 0 in case of success or -1 in case of error.
+ */
+static inline int afb_daemon_rename_api_v1(struct afb_daemon daemon, const char *name)
+{
+	return daemon.itf->rename_api(daemon.closure, name);
+}
+
+static inline int afb_daemon_new_api_v1(
+	struct afb_daemon daemon,
+	const char *api,
+	const char *info,
+	int noconcurrency,
+	int (*preinit)(void*, struct afb_dynapi *),
+	void *closure)
+{
+	return daemon.itf->new_api(daemon.closure, api, info, noconcurrency, preinit, closure);
+}