From a808486bae230c982a05980a0a28c00a43c05d3a Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Thu, 18 May 2017 17:49:35 +0200 Subject: Git repo can be used as submodules Clean templates files as they are useless for usage in submodules into a project. Change-Id: I24c71b64ab2b3a958494f3f190c014227a1da576 Signed-off-by: Romain Forlot --- templates/service/binding/CMakeLists.txt | 69 -------- templates/service/binding/xxx-service-cb.c | 241 ---------------------------- templates/service/binding/xxx-service-hat.c | 58 ------- templates/service/binding/xxx-service-hat.h | 78 --------- 4 files changed, 446 deletions(-) delete mode 100644 templates/service/binding/CMakeLists.txt delete mode 100644 templates/service/binding/xxx-service-cb.c delete mode 100644 templates/service/binding/xxx-service-hat.c delete mode 100644 templates/service/binding/xxx-service-hat.h (limited to 'templates/service/binding') diff --git a/templates/service/binding/CMakeLists.txt b/templates/service/binding/CMakeLists.txt deleted file mode 100644 index 0d08b90..0000000 --- a/templates/service/binding/CMakeLists.txt +++ /dev/null @@ -1,69 +0,0 @@ -########################################################################### -# Copyright 2015, 2016, 2017 IoT.bzh -# -# author: Romain Forlot -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -########################################################################### - -# Project target list -# -------------------- -# Add target to project dependency list. Name specified as argument will be -# added to the project target list and the variable ${TARGET_NAME} become -# available with that value. -PROJECT_TARGET_ADD(xxx-service) - - # Define project Targets - add_library(${TARGET_NAME} MODULE - ${TARGET_NAME}-hat.c - ${TARGET_NAME}-cb.c - ) - - # Targets properties - # ------------------ - # Target properties will be used to build package tree that will be - # built using project_package_build. - # OUTPUT_NAME: Depends what is the name of your output file, it is - # mandatory to specify which is its name with target the property - # OUTPUT_NAME for your target. If file name is same of your target then - # use variable ${TARGET_NAME}. - # LABELS: Choose between "BINDING", "HTDOCS", "EXECUTABLE" depending of - # the type of your target. - # PREFIX: This prefix will be added on the output file name specify with - # OUTPUT_NAME. By default, there isn't PREFIX on target except on - # library target with is "lib". - SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES - PREFIX "afs-" - LABELS "BINDING" - LINK_FLAGS ${BINDINGS_LINK_FLAG} - OUTPUT_NAME ${TARGET_NAME}) - - # Link - # ---- - # Library dependencies (include updates automatically). Linked to the - # target. - TARGET_LINK_LIBRARIES(${TARGET_NAME} - ${link_libraries}) - - # Include - # ------- - # Define target includes search and dependencies. Choose between PUBLIC, - # PRIVATE or INTERFACE. PRIVATE and PUBLIC items will populate the - # INCLUDE_DIRECTORIES property of . PUBLIC and INTERFACE items - # will populate the INTERFACE_INCLUDE_DIRECTORIES property of . - # The following arguments specify include directories. - # INTERFACE_INCLUDE_DIRECTORIES will be read at the - # TARGET_LINK_LIBRARIES step for others targets that link against this - TARGET_INCLUDE_DIRECTORIES(${TARGET_NAME} - PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) - diff --git a/templates/service/binding/xxx-service-cb.c b/templates/service/binding/xxx-service-cb.c deleted file mode 100644 index 9b765ed..0000000 --- a/templates/service/binding/xxx-service-cb.c +++ /dev/null @@ -1,241 +0,0 @@ -/* - * Copyright (C) 2015, 2016 "IoT.bzh" - * Author "Fulup Ar Foll" - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#define _GNU_SOURCE -#include -#include -#include - -#include - #include "xxx-service-hat.h" - - const struct afb_binding_interface *interface; - - static struct event *events = 0; - -/* searchs the event of tag */ - struct event *event_get(const char *tag) -{ - struct event *e = events; - while(e && strcmp(e->tag, tag)) - e = e->next; - return e; -} - -/* deletes the event of tag */ - int event_del(const char *tag) -{ - struct event *e, **p; - - /* check exists */ - e = event_get(tag); - if (!e) return -1; - - /* unlink */ - p = &events; - while(*p != e) p = &(*p)->next; - *p = e->next; - - /* destroys */ - afb_event_drop(e->event); - free(e); - return 0; -} - -/* creates the event of tag */ - int event_add(const char *tag, const char *name) -{ - struct event *e; - - /* check valid tag */ - e = event_get(tag); - if (e) return -1; - - /* creation */ - e = malloc(strlen(tag) + sizeof *e); - if (!e) return -1; - strcpy(e->tag, tag); - - /* make the event */ - e->event = afb_daemon_make_event(interface->daemon, name); - if (!e->event.closure) { free(e); return -1; } - - /* link */ - e->next = events; - events = e; - return 0; -} - - int event_subscribe(struct afb_req request, const char *tag) -{ - struct event *e; - e = event_get(tag); - return e ? afb_req_subscribe(request, e->event) : -1; -} - - int event_unsubscribe(struct afb_req request, const char *tag) -{ - struct event *e; - e = event_get(tag); - return e ? afb_req_unsubscribe(request, e->event) : -1; -} - - int event_push(struct json_object *args, const char *tag) -{ - struct event *e; - e = event_get(tag); - return e ? afb_event_push(e->event, json_object_get(args)) : -1; -} - -// Sample Generic Ping Debug API - static void ping(struct afb_req request, json_object *jresp, const char *tag) -{ - static int pingcount = 0; - json_object *query = afb_req_json(request); - afb_req_success_f(request, jresp, "Ping Binder Daemon tag=%s count=%d query=%s", tag, ++pingcount, json_object_to_json_string(query)); -} - - void pingSample (struct afb_req request) -{ - ping(request, json_object_new_string ("Some String"), "pingSample"); -} - - void pingFail (struct afb_req request) -{ - afb_req_fail(request, "failed", "Ping Binder Daemon fails"); -} - - void pingNull (struct afb_req request) -{ - ping(request, NULL, "pingNull"); -} - - void pingBug (struct afb_req request) -{ - ping((struct afb_req){NULL,NULL}, NULL, "pingBug"); -} - - void pingEvent(struct afb_req request) -{ - json_object *query = afb_req_json(request); - afb_daemon_broadcast_event(interface->daemon, "event", json_object_get(query)); - ping(request, json_object_get(query), "event"); -} - - -// For samples https://linuxprograms.wordpress.com/2010/05/20/json-c-libjson-tutorial/ - void pingJson (struct afb_req request) { - json_object *jresp, *embed; - - jresp = json_object_new_object(); - json_object_object_add(jresp, "myString", json_object_new_string ("Some String")); - json_object_object_add(jresp, "myInt", json_object_new_int (1234)); - - embed = json_object_new_object(); - json_object_object_add(embed, "subObjString", json_object_new_string ("Some String")); - json_object_object_add(embed, "subObjInt", json_object_new_int (5678)); - - json_object_object_add(jresp,"eobj", embed); - - ping(request, jresp, "pingJson"); -} - - void subcallcb (void *prequest, int iserror, json_object *object) -{ - struct afb_req request = afb_req_unstore(prequest); - if (iserror) - afb_req_fail(request, "failed", json_object_to_json_string(object)); - else - afb_req_success(request, object, NULL); - afb_req_unref(request); -} - - void subcall (struct afb_req request) -{ - const char *api = afb_req_value(request, "api"); - const char *verb = afb_req_value(request, "verb"); - const char *args = afb_req_value(request, "args"); - json_object *object = api && verb && args ? json_tokener_parse(args) : NULL; - - if (object == NULL) - afb_req_fail(request, "failed", "bad arguments"); - else - afb_req_subcall(request, api, verb, object, subcallcb, afb_req_store(request)); -} - - void eventadd (struct afb_req request) -{ - const char *tag = afb_req_value(request, "tag"); - const char *name = afb_req_value(request, "name"); - - if (tag == NULL || name == NULL) - afb_req_fail(request, "failed", "bad arguments"); - else if (0 != event_add(tag, name)) - afb_req_fail(request, "failed", "creation error"); - else - afb_req_success(request, NULL, NULL); -} - - void eventdel (struct afb_req request) -{ - const char *tag = afb_req_value(request, "tag"); - - if (tag == NULL) - afb_req_fail(request, "failed", "bad arguments"); - else if (0 != event_del(tag)) - afb_req_fail(request, "failed", "deletion error"); - else - afb_req_success(request, NULL, NULL); -} - - void eventsub (struct afb_req request) -{ - const char *tag = afb_req_value(request, "tag"); - - if (tag == NULL) - afb_req_fail(request, "failed", "bad arguments"); - else if (0 != event_subscribe(request, tag)) - afb_req_fail(request, "failed", "subscription error"); - else - afb_req_success(request, NULL, NULL); -} - - void eventunsub (struct afb_req request) -{ - const char *tag = afb_req_value(request, "tag"); - - if (tag == NULL) - afb_req_fail(request, "failed", "bad arguments"); - else if (0 != event_unsubscribe(request, tag)) - afb_req_fail(request, "failed", "unsubscription error"); - else - afb_req_success(request, NULL, NULL); -} - - void eventpush (struct afb_req request) -{ - const char *tag = afb_req_value(request, "tag"); - const char *data = afb_req_value(request, "data"); - json_object *object = data ? json_tokener_parse(data) : NULL; - - if (tag == NULL) - afb_req_fail(request, "failed", "bad arguments"); - else if (0 > event_push(object, tag)) - afb_req_fail(request, "failed", "push error"); - else - afb_req_success(request, NULL, NULL); -} \ No newline at end of file diff --git a/templates/service/binding/xxx-service-hat.c b/templates/service/binding/xxx-service-hat.c deleted file mode 100644 index 2e172e8..0000000 --- a/templates/service/binding/xxx-service-hat.c +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (C) 2015, 2016 "IoT.bzh" - * Author "Fulup Ar Foll" - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#define _GNU_SOURCE -#include -#include -#include - -#include -#include "xxx-service-hat.h" - -const struct afb_binding_interface *interface; - -// NOTE: this sample does not use session to keep test a basic as possible -// in real application most APIs should be protected with AFB_SESSION_CHECK -static const struct afb_verb_desc_v1 verbs[]= { - {"ping" , AFB_SESSION_NONE, pingSample , "Ping the binder"}, - {"pingfail" , AFB_SESSION_NONE, pingFail , "Ping that fails"}, - {"pingnull" , AFB_SESSION_NONE, pingNull , "Ping which returns NULL"}, - {"pingbug" , AFB_SESSION_NONE, pingBug , "Do a Memory Violation"}, - {"pingJson" , AFB_SESSION_NONE, pingJson , "Return a JSON object"}, - {"pingevent", AFB_SESSION_NONE, pingEvent , "Send an event"}, - {"subcall", AFB_SESSION_NONE, subcall , "Call api/verb(args)"}, - {"eventadd", AFB_SESSION_NONE, eventadd , "adds the event of 'name' for the 'tag'"}, - {"eventdel", AFB_SESSION_NONE, eventdel , "deletes the event of 'tag'"}, - {"eventsub", AFB_SESSION_NONE, eventsub , "subscribes to the event of 'tag'"}, - {"eventunsub",AFB_SESSION_NONE, eventunsub , "unsubscribes to the event of 'tag'"}, - {"eventpush", AFB_SESSION_NONE, eventpush , "pushes the event of 'tag' with the 'data'"}, - {NULL} -}; - -static const struct afb_binding plugin_desc = { - .type = AFB_BINDING_VERSION_1, - .v1 = { - .info = "xxxxxx service", - .prefix = "xxxxxx", - .verbs = verbs - } -}; - -const struct afb_binding *afbBindingV1Register (const struct afb_binding_interface *itf) -{ - interface = itf; - return &plugin_desc; -} diff --git a/templates/service/binding/xxx-service-hat.h b/templates/service/binding/xxx-service-hat.h deleted file mode 100644 index a80c0c2..0000000 --- a/templates/service/binding/xxx-service-hat.h +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (C) 2015, 2016 "IoT.bzh" - * Author "Fulup Ar Foll" - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#ifndef SERVICEHAT_H -#define SERVICEHAT_H - -#define _GNU_SOURCE -#include -#include -#include - -#include - -extern const struct afb_binding_interface *interface; - -struct event -{ - struct event *next; - struct afb_event event; - char tag[1]; -}; - -/* searchs the event of tag */ -struct event *event_get(const char *tag); - -/* deletes the event of tag */ -int event_del(const char *tag); - -/* creates the event of tag */ -int event_add(const char *tag, const char *name); - -int event_subscribe(struct afb_req request, const char *tag); - -int event_unsubscribe(struct afb_req request, const char *tag); - -int event_push(struct json_object *args, const char *tag); - -void pingSample (struct afb_req request); - -void pingFail (struct afb_req request); - -void pingNull (struct afb_req request); - -void pingBug (struct afb_req request); - -void pingEvent(struct afb_req request); - -// For samples https://linuxprograms.wordpress.com/2010/05/20/json-c-libjson-tutorial/ -void pingJson (struct afb_req request); - -void subcallcb (void *prequest, int iserror, json_object *object); - -void subcall (struct afb_req request); - -void eventadd (struct afb_req request); - -void eventdel (struct afb_req request); - -void eventsub (struct afb_req request); - -void eventunsub (struct afb_req request); - -void eventpush (struct afb_req request); - -#endif \ No newline at end of file -- cgit 1.2.3-korg