Repository: celix Updated Branches: refs/heads/develop 4e96cf300 -> 06779dac5
CELIX-341: fixed & refactored shell_tui Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/06779dac Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/06779dac Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/06779dac Branch: refs/heads/develop Commit: 06779dac54c801e4db13cfccbeccbef4c9473e04 Parents: 4e96cf3 Author: Bjoern Petri <[email protected]> Authored: Sat Jan 16 10:36:26 2016 +0100 Committer: Bjoern Petri <[email protected]> Committed: Sat Jan 16 10:36:26 2016 +0100 ---------------------------------------------------------------------- shell_tui/CMakeLists.txt | 4 +- shell_tui/private/include/shell_tui.h | 51 ++++++++ shell_tui/private/src/activator.c | 102 +++++++++++++++ shell_tui/private/src/shell_tui.c | 200 ++++++++++------------------- 4 files changed, 224 insertions(+), 133 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/celix/blob/06779dac/shell_tui/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/shell_tui/CMakeLists.txt b/shell_tui/CMakeLists.txt index ab56f73..6690d46 100644 --- a/shell_tui/CMakeLists.txt +++ b/shell_tui/CMakeLists.txt @@ -22,12 +22,14 @@ if (SHELL_TUI) SET_HEADERS("Bundle-Name: Apache Celix Shell TUI") bundle(shell_tui - SOURCES + SOURCES + private/src/activator private/src/shell_tui ) install_bundle(shell_tui) + include_directories("private/include") include_directories("${PROJECT_SOURCE_DIR}/utils/public/include") include_directories("${PROJECT_SOURCE_DIR}/shell/public/include") target_link_libraries(shell_tui celix_framework) http://git-wip-us.apache.org/repos/asf/celix/blob/06779dac/shell_tui/private/include/shell_tui.h ---------------------------------------------------------------------- diff --git a/shell_tui/private/include/shell_tui.h b/shell_tui/private/include/shell_tui.h new file mode 100644 index 0000000..fec60c9 --- /dev/null +++ b/shell_tui/private/include/shell_tui.h @@ -0,0 +1,51 @@ +/** + *Licensed to the Apache Software Foundation (ASF) under one + *or more contributor license agreements. See the NOTICE file + *distributed with this work for additional information + *regarding copyright ownership. The ASF licenses this file + *to you 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. + */ +/* + * shell_tui.h + * + * \date Jan 16, 2016 + * \author <a href="mailto:[email protected]";>Apache Celix Project Team</a> + * \copyright Apache License, Version 2.0 + */ + +#ifndef SHELL_TUI_H_ +#define SHELL_TUI_H_ + +#include <stdlib.h> + +#include "bundle_context.h" +#include "celix_threads.h" +#include "service_reference.h" +#include "shell.h" + +struct shellTuiActivator { + bundle_context_pt context; + shell_service_pt shell; + service_reference_pt reference; + struct serviceListener * listener; + bool running; + celix_thread_t runnable; +}; + +typedef struct shellTuiActivator * shell_tui_activator_pt; + +celix_status_t shellTui_initializeService(shell_tui_activator_pt activator); +celix_status_t shellTui_serviceChanged(service_listener_pt listener, service_event_pt event); + +#endif /* SHELL_TUI_H_ */ http://git-wip-us.apache.org/repos/asf/celix/blob/06779dac/shell_tui/private/src/activator.c ---------------------------------------------------------------------- diff --git a/shell_tui/private/src/activator.c b/shell_tui/private/src/activator.c new file mode 100644 index 0000000..ee03b30 --- /dev/null +++ b/shell_tui/private/src/activator.c @@ -0,0 +1,102 @@ +/** + *Licensed to the Apache Software Foundation (ASF) under one + *or more contributor license agreements. See the NOTICE file + *distributed with this work for additional information + *regarding copyright ownership. The ASF licenses this file + *to you 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. + */ +/* + * activator.c + * + * \date Jan 15, 2016 + * \author <a href="mailto:[email protected]";>Apache Celix Project Team</a> + * \copyright Apache License, Version 2.0 + */ +#include <stdlib.h> + +#include "bundle_context.h" +#include "bundle_activator.h" + + +#include "shell_tui.h" + + + +celix_status_t bundleActivator_create(bundle_context_pt context, void **userData) { + celix_status_t status = CELIX_SUCCESS; + + shell_tui_activator_pt activator = (shell_tui_activator_pt) calloc(1, sizeof(*activator)); + + if (activator) { + activator->shell = NULL; + (*userData) = activator; + } + else { + status = CELIX_ENOMEM; + } + + return status; +} + +celix_status_t bundleActivator_start(void * userData, bundle_context_pt context) { + celix_status_t status; + + shell_tui_activator_pt act = (shell_tui_activator_pt) userData; + service_listener_pt listener = (service_listener_pt) calloc(1, sizeof(*listener)); + + act->context = context; + act->running = true; + + act->listener = listener; + act->listener->handle = act; + act->listener->serviceChanged = (void *) shellTui_serviceChanged; + status = bundleContext_addServiceListener(context, act->listener, "(objectClass=shellService)"); + + if (status == CELIX_SUCCESS) { + shellTui_initializeService(act); + } + + return status; +} + +celix_status_t bundleActivator_stop(void * userData, bundle_context_pt context) { + celix_status_t status; + shell_tui_activator_pt activator = (shell_tui_activator_pt) userData; + + bundleContext_ungetService(activator->context,activator->reference,NULL); + bundleContext_ungetServiceReference(activator->context,activator->reference); + + status = bundleContext_removeServiceListener(context, activator->listener); + + if (status == CELIX_SUCCESS) { + free(activator->listener); + + activator->running = false; + activator->listener = NULL; + activator->context = NULL; + activator->running = false; + + celixThread_join(activator->runnable, NULL); + } + + return status; +} + +celix_status_t bundleActivator_destroy(void * userData, bundle_context_pt context) { + shell_tui_activator_pt activator = (shell_tui_activator_pt) userData; + + free(activator); + + return CELIX_SUCCESS; +} http://git-wip-us.apache.org/repos/asf/celix/blob/06779dac/shell_tui/private/src/shell_tui.c ---------------------------------------------------------------------- diff --git a/shell_tui/private/src/shell_tui.c b/shell_tui/private/src/shell_tui.c index e31dff3..4f5044c 100644 --- a/shell_tui/private/src/shell_tui.c +++ b/shell_tui/private/src/shell_tui.c @@ -32,155 +32,91 @@ #include "bundle_context.h" #include "bundle_activator.h" #include "shell.h" +#include "shell_tui.h" #include "utils.h" -struct shellTuiActivator { - bundle_context_pt context; - shell_service_pt shell; - service_reference_pt reference; - struct serviceListener * listener; - bool running; - celix_thread_t runnable; -}; - typedef struct shellTuiActivator * shell_tui_activator_pt; - static void* shellTui_runnable(void *data) { - shell_tui_activator_pt act = (shell_tui_activator_pt) data; - - char in[256]; - char dline[256]; - bool needPrompt = true; - - fd_set rfds; - struct timeval tv; - - while (act->running) { - char * line = NULL; - if (needPrompt) { - printf("-> "); - fflush(stdout); - needPrompt = false; - } - FD_ZERO(&rfds); - FD_SET(0, &rfds); - - tv.tv_sec = 1; - tv.tv_usec = 0; - - if (select(1, &rfds, NULL, NULL, &tv)) { - fgets(in, 256, stdin); - needPrompt = true; - memset(dline, 0, 256); - strncpy(dline, in, 256); - - line = utils_stringTrim(dline); - if ((strlen(line) == 0) || (act->shell == NULL)) { - continue; - } - - act->shell->executeCommand(act->shell->shell, line, stdout, stderr); - } - } - - return NULL; + shell_tui_activator_pt act = (shell_tui_activator_pt) data; + + char in[256]; + char dline[256]; + bool needPrompt = true; + + fd_set rfds; + struct timeval tv; + + while (act->running) { + char * line = NULL; + if (needPrompt) { + printf("-> "); + fflush(stdout); + needPrompt = false; + } + FD_ZERO(&rfds); + FD_SET(0, &rfds); + + tv.tv_sec = 1; + tv.tv_usec = 0; + + if (select(1, &rfds, NULL, NULL, &tv)) { + fgets(in, 256, stdin); + needPrompt = true; + memset(dline, 0, 256); + strncpy(dline, in, 256); + + line = utils_stringTrim(dline); + if ((strlen(line) == 0) || (act->shell == NULL)) { + continue; + } + + act->shell->executeCommand(act->shell->shell, line, stdout, stderr); + } + } + + return NULL; } -void shellTui_initializeService(shell_tui_activator_pt activator) { - if (activator->shell == NULL) { - bundleContext_getServiceReference(activator->context, (char *) OSGI_SHELL_SERVICE_NAME, &activator->reference); - if (activator->reference != NULL) { - void *shell_svc = NULL; - bundleContext_getService(activator->context, activator->reference, &shell_svc); - activator->shell = (shell_service_pt) shell_svc; - } - } -} - -void shellTui_serviceChanged(service_listener_pt listener, service_event_pt event) { - bool result = false; - shell_tui_activator_pt act = (shell_tui_activator_pt) listener->handle; - bool equals = false; - - serviceReference_equals(act->reference, event->reference, &equals); +celix_status_t shellTui_initializeService(shell_tui_activator_pt activator) { - if ((event->type == OSGI_FRAMEWORK_SERVICE_EVENT_REGISTERED) && (act->reference == NULL)) { - shellTui_initializeService(act); - } else if ((event->type == OSGI_FRAMEWORK_SERVICE_EVENT_UNREGISTERING) && (equals)) { - bundleContext_ungetService(act->context, act->reference, &result); - act->reference = NULL; - act->shell = NULL; + celix_status_t status = CELIX_SUCCESS; - shellTui_initializeService(act); - } -} - -celix_status_t bundleActivator_create(bundle_context_pt context, void **userData) { - celix_status_t status = CELIX_SUCCESS; + if (activator->shell != NULL) { + status = CELIX_ILLEGAL_ARGUMENT; + } else { + status = bundleContext_getServiceReference(activator->context, (char *) OSGI_SHELL_SERVICE_NAME, &activator->reference); - shell_tui_activator_pt activator = (shell_tui_activator_pt) calloc(1, sizeof(*activator)); + if (status != CELIX_SUCCESS || activator->reference != NULL) { + void *shell_svc = NULL; + bundleContext_getService(activator->context, activator->reference, &shell_svc); + activator->shell = (shell_service_pt) shell_svc; - if (activator) { - activator->shell = NULL; - (*userData) = activator; - } - else { - status = CELIX_ENOMEM; - } + celixThread_create(&activator->runnable, NULL, shellTui_runnable, activator); + } + } - return status; + return status; } -celix_status_t bundleActivator_start(void * userData, bundle_context_pt context) { - celix_status_t status; - - shell_tui_activator_pt act = (shell_tui_activator_pt) userData; - service_listener_pt listener = (service_listener_pt) malloc(sizeof(*listener)); - - act->context = context; - act->running = true; - - act->listener = listener; - act->listener->handle = act; - act->listener->serviceChanged = (void *) shellTui_serviceChanged; - status = bundleContext_addServiceListener(context, act->listener, "(objectClass=shellService)"); +celix_status_t shellTui_serviceChanged(service_listener_pt listener, service_event_pt event) { + celix_status_t status = CELIX_SUCCESS; - if (status == CELIX_SUCCESS) { - shellTui_initializeService(act); - celixThread_create(&act->runnable, NULL, shellTui_runnable, act); - } + bool result = false; + shell_tui_activator_pt act = (shell_tui_activator_pt) listener->handle; + bool equals = false; - return status; -} - -celix_status_t bundleActivator_stop(void * userData, bundle_context_pt context) { - celix_status_t status; - shell_tui_activator_pt activator = (shell_tui_activator_pt) userData; - - bundleContext_ungetService(activator->context,activator->reference,NULL); - bundleContext_ungetServiceReference(activator->context,activator->reference); - - status = bundleContext_removeServiceListener(context, activator->listener); - - if (status == CELIX_SUCCESS) { - free(activator->listener); - - activator->running = false; - activator->listener = NULL; - activator->context = NULL; - activator->running = false; - - celixThread_join(activator->runnable, NULL); - } - - return status; -} + serviceReference_equals(act->reference, event->reference, &equals); -celix_status_t bundleActivator_destroy(void * userData, bundle_context_pt context) { - shell_tui_activator_pt activator = (shell_tui_activator_pt) userData; + if ((event->type == OSGI_FRAMEWORK_SERVICE_EVENT_REGISTERED) && (act->reference == NULL)) { + status = shellTui_initializeService(act); + } else if ((event->type == OSGI_FRAMEWORK_SERVICE_EVENT_UNREGISTERING) && (equals)) { + bundleContext_ungetService(act->context, act->reference, &result); + act->reference = NULL; + act->shell = NULL; - free(activator); + status = shellTui_initializeService(act); + } - return CELIX_SUCCESS; + return status; }
