celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject [celix] branch develop updated: CELIX-410: Some refactoring for travis ci
Date Mon, 18 Mar 2019 16:59:40 GMT
This is an automated email from the ASF dual-hosted git repository.

pnoltes pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/celix.git


The following commit(s) were added to refs/heads/develop by this push:
     new cb1f7a8  CELIX-410: Some refactoring for travis ci
cb1f7a8 is described below

commit cb1f7a8a2260d3544d61e8acab5d87f46b071198
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
AuthorDate: Mon Mar 18 17:59:15 2019 +0100

    CELIX-410: Some refactoring for travis ci
---
 .../remote_service_admin_dfi/src/remote_service_admin_activator.c  | 7 -------
 .../remote_service_admin_dfi/src/remote_service_admin_dfi.h        | 4 +++-
 .../src/remote_service_admin_dfi_constants.h                       | 2 +-
 bundles/remote_services/rsa_spi/include/remote_service_admin.h     | 1 +
 bundles/shell/shell_tui/private/src/shell_tui.c                    | 5 +++++
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/bundles/remote_services/remote_service_admin_dfi/src/remote_service_admin_activator.c
b/bundles/remote_services/remote_service_admin_dfi/src/remote_service_admin_activator.c
index d4cc765..76f5459 100644
--- a/bundles/remote_services/remote_service_admin_dfi/src/remote_service_admin_activator.c
+++ b/bundles/remote_services/remote_service_admin_dfi/src/remote_service_admin_activator.c
@@ -16,13 +16,6 @@
  *specific language governing permissions and limitations
  *under the License.
  */
-/*
- * remote_service_admin_activator.c
- *
- *  \date       Sep 30, 2011
- *  \author    	<a href="mailto:dev@celix.apache.org">Apache Celix Project Team</a>
- *  \copyright	Apache License, Version 2.0
- */
 #include <stdlib.h>
 #include <remote_service_admin.h>
 
diff --git a/bundles/remote_services/remote_service_admin_dfi/src/remote_service_admin_dfi.h
b/bundles/remote_services/remote_service_admin_dfi/src/remote_service_admin_dfi.h
index cd7d3b5..86ed5dd 100644
--- a/bundles/remote_services/remote_service_admin_dfi/src/remote_service_admin_dfi.h
+++ b/bundles/remote_services/remote_service_admin_dfi/src/remote_service_admin_dfi.h
@@ -26,7 +26,9 @@
 #include "endpoint_description.h"
 #include "export_registration_dfi.h"
 
-typedef struct remote_service_admin *remote_service_admin_pt;
+#include "remote_service_admin.h" //service typedef and remote_service_admin_pt typedef
+
+//typedef struct remote_service_admin *remote_service_admin_pt;
 
 celix_status_t remoteServiceAdmin_create(bundle_context_pt context, remote_service_admin_pt
*admin);
 celix_status_t remoteServiceAdmin_destroy(remote_service_admin_pt *admin);
diff --git a/bundles/remote_services/remote_service_admin_dfi/src/remote_service_admin_dfi_constants.h
b/bundles/remote_services/remote_service_admin_dfi/src/remote_service_admin_dfi_constants.h
index 763a8c5..53657a0 100644
--- a/bundles/remote_services/remote_service_admin_dfi/src/remote_service_admin_dfi_constants.h
+++ b/bundles/remote_services/remote_service_admin_dfi/src/remote_service_admin_dfi_constants.h
@@ -20,7 +20,7 @@
 #ifndef CELIX_REMOTE_SERVICE_ADMIN_DFI_CONSTANTS_H
 #define CELIX_REMOTE_SERVICE_ADMIN_DFI_CONSTANTS_H
 
-#define RSA_PORT_KEY                "RSA_PORT"
+#define RSA_PORT_KEY                    "RSA_PORT"
 #define RSA_PORT_DEFAULT                8888
 
 #define RSA_IP_KEY                      "RSA_IP"
diff --git a/bundles/remote_services/rsa_spi/include/remote_service_admin.h b/bundles/remote_services/rsa_spi/include/remote_service_admin.h
index cc7fd98..c2d543e 100644
--- a/bundles/remote_services/rsa_spi/include/remote_service_admin.h
+++ b/bundles/remote_services/rsa_spi/include/remote_service_admin.h
@@ -37,6 +37,7 @@
 typedef struct import_registration_factory import_registration_factory_t;
 typedef import_registration_factory_t* import_registration_factory_pt;
 
+//TODO refactor remote_service_admin_pt usage to void *handle;
 typedef struct remote_service_admin remote_service_admin_t;
 typedef remote_service_admin_t* remote_service_admin_pt;
 
diff --git a/bundles/shell/shell_tui/private/src/shell_tui.c b/bundles/shell/shell_tui/private/src/shell_tui.c
index 2ceb21a..38742f7 100644
--- a/bundles/shell/shell_tui/private/src/shell_tui.c
+++ b/bundles/shell/shell_tui/private/src/shell_tui.c
@@ -218,6 +218,11 @@ static void* shellTui_runnable(void *data) {
                 } else {
                     shellTui_parseInput(shellTui, &ctx);
                 }
+
+                if (!isatty(STDIN_FILENO)) {
+                    //not connected to a tty anymore. sleep for 1 sec
+                    usleep(10000000);
+                }
             }
         }
     }


Mime
View raw message