You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by pn...@apache.org on 2013/06/12 21:08:55 UTC
svn commit: r1492377 [10/12] - in /incubator/celix/trunk:
dependency_manager/private/src/ dependency_manager/public/include/
deployment_admin/private/include/ deployment_admin/private/src/
deployment_admin/public/include/ device_access/device_access/pr...
Modified: incubator/celix/trunk/remote_services/remote_service_admin/private/src/remote_service_admin_impl.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin/private/src/remote_service_admin_impl.c?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin/private/src/remote_service_admin_impl.c (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin/private/src/remote_service_admin_impl.c Wed Jun 12 19:08:50 2013
@@ -47,11 +47,11 @@ static const char *ajax_reply_start =
"\r\n";
void *remoteServiceAdmin_callback(enum mg_event event, struct mg_connection *conn, const struct mg_request_info *request_info);
-celix_status_t remoteServiceAdmin_installEndpoint(remote_service_admin_t admin, export_registration_t registration, service_reference_t reference, char *interface);
-celix_status_t remoteServiceAdmin_createEndpointDescription(remote_service_admin_t admin, properties_t serviceProperties, properties_t endpointProperties, char *interface, endpoint_description_t *description);
-celix_status_t remoteServiceAdmin_getUUID(remote_service_admin_t rsa, char **uuidStr);
+celix_status_t remoteServiceAdmin_installEndpoint(remote_service_admin_pt admin, export_registration_pt registration, service_reference_pt reference, char *interface);
+celix_status_t remoteServiceAdmin_createEndpointDescription(remote_service_admin_pt admin, properties_pt serviceProperties, properties_pt endpointProperties, char *interface, endpoint_description_pt *description);
+celix_status_t remoteServiceAdmin_getUUID(remote_service_admin_pt rsa, char **uuidStr);
-celix_status_t remoteServiceAdmin_create(apr_pool_t *pool, bundle_context_t context, remote_service_admin_t *admin) {
+celix_status_t remoteServiceAdmin_create(apr_pool_t *pool, bundle_context_pt context, remote_service_admin_pt *admin) {
celix_status_t status = CELIX_SUCCESS;
*admin = apr_palloc(pool, sizeof(**admin));
@@ -76,24 +76,24 @@ celix_status_t remoteServiceAdmin_create
return status;
}
-celix_status_t remoteServiceAdmin_stop(remote_service_admin_t admin) {
+celix_status_t remoteServiceAdmin_stop(remote_service_admin_pt admin) {
celix_status_t status = CELIX_SUCCESS;
- hash_map_iterator_t iter = hashMapIterator_create(admin->exportedServices);
+ hash_map_iterator_pt iter = hashMapIterator_create(admin->exportedServices);
while (hashMapIterator_hasNext(iter)) {
- array_list_t exports = hashMapIterator_nextValue(iter);
+ array_list_pt exports = hashMapIterator_nextValue(iter);
int i;
for (i = 0; i < arrayList_size(exports); i++) {
- export_registration_t export = arrayList_get(exports, i);
+ export_registration_pt export = arrayList_get(exports, i);
exportRegistration_stopTracking(export);
}
}
iter = hashMapIterator_create(admin->importedServices);
while (hashMapIterator_hasNext(iter)) {
- array_list_t exports = hashMapIterator_nextValue(iter);
+ array_list_pt exports = hashMapIterator_nextValue(iter);
int i;
for (i = 0; i < arrayList_size(exports); i++) {
- import_registration_t export = arrayList_get(exports, i);
+ import_registration_pt export = arrayList_get(exports, i);
importRegistration_stopTracking(export);
}
}
@@ -107,7 +107,7 @@ celix_status_t remoteServiceAdmin_stop(r
void *remoteServiceAdmin_callback(enum mg_event event, struct mg_connection *conn, const struct mg_request_info *request_info) {
if (request_info->uri != NULL) {
printf("REMOTE_SERVICE_ADMIN: Handle request: %s\n", request_info->uri);
- remote_service_admin_t rsa = request_info->user_data;
+ remote_service_admin_pt rsa = request_info->user_data;
if (strncmp(request_info->uri, "/services/", 10) == 0) {
// uri = /services/myservice/call
@@ -130,13 +130,13 @@ void *remoteServiceAdmin_callback(enum m
mg_read(conn, data, datalength);
data[datalength] = '\0';
- hash_map_iterator_t iter = hashMapIterator_create(rsa->exportedServices);
+ hash_map_iterator_pt iter = hashMapIterator_create(rsa->exportedServices);
while (hashMapIterator_hasNext(iter)) {
- hash_map_entry_t entry = hashMapIterator_nextEntry(iter);
- array_list_t exports = hashMapEntry_getValue(entry);
+ hash_map_entry_pt entry = hashMapIterator_nextEntry(iter);
+ array_list_pt exports = hashMapEntry_getValue(entry);
int expIt = 0;
for (expIt = 0; expIt < arrayList_size(exports); expIt++) {
- export_registration_t export = arrayList_get(exports, expIt);
+ export_registration_pt export = arrayList_get(exports, expIt);
if (strcmp(service, export->endpointDescription->service) == 0) {
char *reply = NULL;
export->endpoint->handleRequest(export->endpoint->endpoint, request, data, &reply);
@@ -153,14 +153,14 @@ void *remoteServiceAdmin_callback(enum m
return "";
}
-celix_status_t remoteServiceAdmin_handleRequest(remote_service_admin_t rsa, char *service, char *request, char *data, char **reply) {
- hash_map_iterator_t iter = hashMapIterator_create(rsa->exportedServices);
+celix_status_t remoteServiceAdmin_handleRequest(remote_service_admin_pt rsa, char *service, char *request, char *data, char **reply) {
+ hash_map_iterator_pt iter = hashMapIterator_create(rsa->exportedServices);
while (hashMapIterator_hasNext(iter)) {
- hash_map_entry_t entry = hashMapIterator_nextEntry(iter);
- array_list_t exports = hashMapEntry_getValue(entry);
+ hash_map_entry_pt entry = hashMapIterator_nextEntry(iter);
+ array_list_pt exports = hashMapEntry_getValue(entry);
int expIt = 0;
for (expIt = 0; expIt < arrayList_size(exports); expIt++) {
- export_registration_t export = arrayList_get(exports, expIt);
+ export_registration_pt export = arrayList_get(exports, expIt);
if (strcmp(service, export->endpointDescription->service) == 0) {
export->endpoint->handleRequest(export->endpoint->endpoint, request, data, reply);
}
@@ -169,13 +169,13 @@ celix_status_t remoteServiceAdmin_handle
return CELIX_SUCCESS;
}
-celix_status_t remoteServiceAdmin_exportService(remote_service_admin_t admin, service_reference_t reference, properties_t properties, array_list_t *registrations) {
+celix_status_t remoteServiceAdmin_exportService(remote_service_admin_pt admin, service_reference_pt reference, properties_pt properties, array_list_pt *registrations) {
celix_status_t status = CELIX_SUCCESS;
arrayList_create(admin->pool, registrations);
- service_registration_t registration = NULL;
+ service_registration_pt registration = NULL;
serviceReference_getServiceRegistration(reference, ®istration);
- properties_t serviceProperties = NULL;
+ properties_pt serviceProperties = NULL;
serviceRegistration_getProperties(registration, &serviceProperties);
char *exports = properties_get(serviceProperties, (char *) SERVICE_EXPORTED_INTERFACES);
char *provided = properties_get(serviceProperties, (char *) OBJECTCLASS);
@@ -184,7 +184,7 @@ celix_status_t remoteServiceAdmin_export
printf("RSA: No Services to export.\n");
} else {
printf("RSA: Export services (%s)\n", exports);
- array_list_t interfaces = NULL;
+ array_list_pt interfaces = NULL;
arrayList_create(admin->pool, &interfaces);
if (strcmp(string_trim(exports), "*") == 0) {
char *token;
@@ -214,7 +214,7 @@ celix_status_t remoteServiceAdmin_export
int iter = 0;
for (iter = 0; iter < arrayList_size(interfaces); iter++) {
char *interface = arrayList_get(interfaces, iter);
- export_registration_t registration = NULL;
+ export_registration_pt registration = NULL;
exportRegistration_create(admin->pool, reference, NULL, admin, admin->context, ®istration);
arrayList_add(*registrations, registration);
@@ -230,19 +230,19 @@ celix_status_t remoteServiceAdmin_export
return status;
}
-celix_status_t remoteServiceAdmin_installEndpoint(remote_service_admin_t admin, export_registration_t registration, service_reference_t reference, char *interface) {
+celix_status_t remoteServiceAdmin_installEndpoint(remote_service_admin_pt admin, export_registration_pt registration, service_reference_pt reference, char *interface) {
celix_status_t status = CELIX_SUCCESS;
- properties_t endpointProperties = properties_create();
- properties_t serviceProperties = NULL;
+ properties_pt endpointProperties = properties_create();
+ properties_pt serviceProperties = NULL;
- service_registration_t sRegistration = NULL;
+ service_registration_pt sRegistration = NULL;
serviceReference_getServiceRegistration(reference, &sRegistration);
serviceRegistration_getProperties(sRegistration, &serviceProperties);
- hash_map_iterator_t iter = hashMapIterator_create(serviceProperties);
+ hash_map_iterator_pt iter = hashMapIterator_create(serviceProperties);
while (hashMapIterator_hasNext(iter)) {
- hash_map_entry_t entry = hashMapIterator_nextEntry(iter);
+ hash_map_entry_pt entry = hashMapIterator_nextEntry(iter);
char *key = (char *) hashMapEntry_getKey(entry);
char *value = (char *) hashMapEntry_getValue(entry);
@@ -257,15 +257,15 @@ celix_status_t remoteServiceAdmin_instal
char *service = "/services/example";
properties_set(endpointProperties, (char *) SERVICE_LOCATION, apr_pstrdup(admin->pool, service));
- endpoint_description_t endpointDescription = NULL;
+ endpoint_description_pt endpointDescription = NULL;
remoteServiceAdmin_createEndpointDescription(admin, serviceProperties, endpointProperties, interface, &endpointDescription);
exportRegistration_setEndpointDescription(registration, endpointDescription);
return status;
}
-celix_status_t remoteServiceAdmin_createEndpointDescription(remote_service_admin_t admin, properties_t serviceProperties,
- properties_t endpointProperties, char *interface, endpoint_description_t *description) {
+celix_status_t remoteServiceAdmin_createEndpointDescription(remote_service_admin_pt admin, properties_pt serviceProperties,
+ properties_pt endpointProperties, char *interface, endpoint_description_pt *description) {
celix_status_t status = CELIX_SUCCESS;
apr_pool_t *childPool = NULL;
@@ -290,23 +290,23 @@ celix_status_t remoteServiceAdmin_create
return status;
}
-celix_status_t remoteServiceAdmin_getExportedServices(remote_service_admin_t admin, array_list_t *services) {
+celix_status_t remoteServiceAdmin_getExportedServices(remote_service_admin_pt admin, array_list_pt *services) {
celix_status_t status = CELIX_SUCCESS;
return status;
}
-celix_status_t remoteServiceAdmin_getImportedEndpoints(remote_service_admin_t admin, array_list_t *services) {
+celix_status_t remoteServiceAdmin_getImportedEndpoints(remote_service_admin_pt admin, array_list_pt *services) {
celix_status_t status = CELIX_SUCCESS;
return status;
}
-celix_status_t remoteServiceAdmin_importService(remote_service_admin_t admin, endpoint_description_t endpoint, import_registration_t *registration) {
+celix_status_t remoteServiceAdmin_importService(remote_service_admin_pt admin, endpoint_description_pt endpoint, import_registration_pt *registration) {
celix_status_t status = CELIX_SUCCESS;
printf("RSA: Import service %s\n", endpoint->service);
importRegistration_create(admin->pool, endpoint, admin, admin->context, registration);
- array_list_t importedRegs = hashMap_get(admin->importedServices, endpoint);
+ array_list_pt importedRegs = hashMap_get(admin->importedServices, endpoint);
if (importedRegs == NULL) {
arrayList_create(admin->pool, &importedRegs);
hashMap_put(admin->importedServices, endpoint, importedRegs);
@@ -320,7 +320,7 @@ celix_status_t remoteServiceAdmin_import
}
-celix_status_t exportReference_getExportedEndpoint(export_reference_t reference, endpoint_description_t *endpoint) {
+celix_status_t exportReference_getExportedEndpoint(export_reference_pt reference, endpoint_description_pt *endpoint) {
celix_status_t status = CELIX_SUCCESS;
*endpoint = reference->endpoint;
@@ -328,22 +328,22 @@ celix_status_t exportReference_getExport
return status;
}
-celix_status_t exportReference_getExportedService(export_reference_t reference) {
+celix_status_t exportReference_getExportedService(export_reference_pt reference) {
celix_status_t status = CELIX_SUCCESS;
return status;
}
-celix_status_t importReference_getImportedEndpoint(import_reference_t reference) {
+celix_status_t importReference_getImportedEndpoint(import_reference_pt reference) {
celix_status_t status = CELIX_SUCCESS;
return status;
}
-celix_status_t importReference_getImportedService(import_reference_t reference) {
+celix_status_t importReference_getImportedService(import_reference_pt reference) {
celix_status_t status = CELIX_SUCCESS;
return status;
}
-celix_status_t remoteServiceAdmin_getUUID(remote_service_admin_t rsa, char **uuidStr) {
+celix_status_t remoteServiceAdmin_getUUID(remote_service_admin_pt rsa, char **uuidStr) {
celix_status_t status = CELIX_SUCCESS;
status = bundleContext_getProperty(rsa->context, ENDPOINT_FRAMEWORK_UUID, uuidStr);
Modified: incubator/celix/trunk/remote_services/remote_service_admin/public/include/remote_endpoint.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin/public/include/remote_endpoint.h?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin/public/include/remote_endpoint.h (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin/public/include/remote_endpoint.h Wed Jun 12 19:08:50 2013
@@ -29,15 +29,15 @@
#define REMOTE_ENDPOINT "remote_endpoint"
-typedef struct remote_endpoint *remote_endpoint_t;
+typedef struct remote_endpoint *remote_endpoint_pt;
struct remote_endpoint_service {
- remote_endpoint_t endpoint;
- celix_status_t (*setService)(remote_endpoint_t endpoint, void *service);
- celix_status_t (*handleRequest)(remote_endpoint_t endpoint, char *request, char *data, char **reply);
+ remote_endpoint_pt endpoint;
+ celix_status_t (*setService)(remote_endpoint_pt endpoint, void *service);
+ celix_status_t (*handleRequest)(remote_endpoint_pt endpoint, char *request, char *data, char **reply);
};
-typedef struct remote_endpoint_service *remote_endpoint_service_t;
+typedef struct remote_endpoint_service *remote_endpoint_service_pt;
#endif /* REMOTE_ENDPOINT_H_ */
Modified: incubator/celix/trunk/remote_services/remote_service_admin/public/include/remote_proxy.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin/public/include/remote_proxy.h?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin/public/include/remote_proxy.h (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin/public/include/remote_proxy.h Wed Jun 12 19:08:50 2013
@@ -33,9 +33,9 @@
struct remote_proxy_service {
void *proxy;
- celix_status_t (*setEndpointDescription)(void *proxy, endpoint_description_t service);
+ celix_status_t (*setEndpointDescription)(void *proxy, endpoint_description_pt service);
};
-typedef struct remote_proxy_service *remote_proxy_service_t;
+typedef struct remote_proxy_service *remote_proxy_service_pt;
#endif /* REMOTE_PROXY_H_ */
Modified: incubator/celix/trunk/remote_services/remote_service_admin/public/include/remote_service_admin.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin/public/include/remote_service_admin.h?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin/public/include/remote_service_admin.h (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin/public/include/remote_service_admin.h Wed Jun 12 19:08:50 2013
@@ -32,37 +32,37 @@
#define REMOTE_SERVICE_ADMIN "remote_service_admin"
-typedef struct export_reference *export_reference_t;
-typedef struct export_registration *export_registration_t;
-typedef struct import_reference *import_reference_t;
-typedef struct import_registration *import_registration_t;
-typedef struct remote_service_admin *remote_service_admin_t;
+typedef struct export_reference *export_reference_pt;
+typedef struct export_registration *export_registration_pt;
+typedef struct import_reference *import_reference_pt;
+typedef struct import_registration *import_registration_pt;
+typedef struct remote_service_admin *remote_service_admin_pt;
struct remote_service_admin_service {
- remote_service_admin_t admin;
- celix_status_t (*exportService)(remote_service_admin_t admin, service_reference_t reference, properties_t properties, array_list_t *registrations);
- celix_status_t (*getExportedServices)(remote_service_admin_t admin, array_list_t *services);
- celix_status_t (*getImportedEndpoints)(remote_service_admin_t admin, array_list_t *services);
- celix_status_t (*importService)(remote_service_admin_t admin, endpoint_description_t endpoint, import_registration_t *registration);
-
-
- celix_status_t (*exportReference_getExportedEndpoint)(export_reference_t reference, endpoint_description_t *endpoint);
- celix_status_t (*exportReference_getExportedService)(export_reference_t reference);
-
- celix_status_t (*exportRegistration_close)(export_registration_t registration);
- celix_status_t (*exportRegistration_getException)(export_registration_t registration);
- celix_status_t (*exportRegistration_getExportReference)(export_registration_t registration, export_reference_t *reference);
-
- celix_status_t (*importReference_getImportedEndpoint)(import_reference_t reference);
- celix_status_t (*importReference_getImportedService)(import_reference_t reference);
-
- celix_status_t (*importRegistration_close)(import_registration_t registration);
- celix_status_t (*importRegistration_getException)(import_registration_t registration);
- celix_status_t (*importRegistration_getImportReference)(import_registration_t registration, import_reference_t *reference);
+ remote_service_admin_pt admin;
+ celix_status_t (*exportService)(remote_service_admin_pt admin, service_reference_pt reference, properties_pt properties, array_list_pt *registrations);
+ celix_status_t (*getExportedServices)(remote_service_admin_pt admin, array_list_pt *services);
+ celix_status_t (*getImportedEndpoints)(remote_service_admin_pt admin, array_list_pt *services);
+ celix_status_t (*importService)(remote_service_admin_pt admin, endpoint_description_pt endpoint, import_registration_pt *registration);
+
+
+ celix_status_t (*exportReference_getExportedEndpoint)(export_reference_pt reference, endpoint_description_pt *endpoint);
+ celix_status_t (*exportReference_getExportedService)(export_reference_pt reference);
+
+ celix_status_t (*exportRegistration_close)(export_registration_pt registration);
+ celix_status_t (*exportRegistration_getException)(export_registration_pt registration);
+ celix_status_t (*exportRegistration_getExportReference)(export_registration_pt registration, export_reference_pt *reference);
+
+ celix_status_t (*importReference_getImportedEndpoint)(import_reference_pt reference);
+ celix_status_t (*importReference_getImportedService)(import_reference_pt reference);
+
+ celix_status_t (*importRegistration_close)(import_registration_pt registration);
+ celix_status_t (*importRegistration_getException)(import_registration_pt registration);
+ celix_status_t (*importRegistration_getImportReference)(import_registration_pt registration, import_reference_pt *reference);
};
-typedef struct remote_service_admin_service *remote_service_admin_service_t;
+typedef struct remote_service_admin_service *remote_service_admin_service_pt;
#endif /* REMOTE_SERVICE_ADMIN_H_ */
Modified: incubator/celix/trunk/remote_services/remote_service_admin_http/private/include/mongoose.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin_http/private/include/mongoose.h?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin_http/private/include/mongoose.h (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin_http/private/include/mongoose.h Wed Jun 12 19:08:50 2013
@@ -76,7 +76,7 @@ enum mg_event {
// If callback returns NULL, that means that callback has not processed
// the request. Handler must not send any data to the client in this case.
// Mongoose proceeds with request handling as if nothing happened.
-typedef void * (*mg_callback_t)(enum mg_event event,
+typedef void * (*mg_callback_pt)(enum mg_event event,
struct mg_connection *conn,
const struct mg_request_info *request_info);
@@ -106,7 +106,7 @@ typedef void * (*mg_callback_t)(enum mg_
//
// Return:
// web server context, or NULL on error.
-struct mg_context *mg_start(mg_callback_t callback, void *user_data,
+struct mg_context *mg_start(mg_callback_pt callback, void *user_data,
const char **options);
Modified: incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/mongoose.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/mongoose.c?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/mongoose.c (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/mongoose.c Wed Jun 12 19:08:50 2013
@@ -247,7 +247,7 @@ static pthread_t pthread_self(void) {
typedef int socklen_t;
#endif // NO_SOCKLEN_T
-typedef void * (*mg_thread_func_t)(void *);
+typedef void * (*mg_thread_func_pt)(void *);
static const char *http_500_error = "Internal Server Error";
@@ -279,7 +279,7 @@ extern void SSL_load_error_strings(void)
extern int SSL_CTX_use_PrivateKey_file(SSL_CTX *, const char *, int);
extern int SSL_CTX_use_certificate_file(SSL_CTX *, const char *, int);
extern int SSL_CTX_use_certificate_chain_file(SSL_CTX *, const char *);
-extern void SSL_CTX_set_default_passwd_cb(SSL_CTX *, mg_callback_t);
+extern void SSL_CTX_set_default_passwd_cb(SSL_CTX *, mg_callback_pt);
extern void SSL_CTX_free(SSL_CTX *);
extern unsigned long ERR_get_error(void);
extern char *ERR_error_string(unsigned long, char *);
@@ -309,7 +309,7 @@ struct ssl_func {
#define SSL_CTX_use_certificate_file (* (int (*)(SSL_CTX *, \
const char *, int)) ssl_sw[12].ptr)
#define SSL_CTX_set_default_passwd_cb \
- (* (void (*)(SSL_CTX *, mg_callback_t)) ssl_sw[13].ptr)
+ (* (void (*)(SSL_CTX *, mg_callback_pt)) ssl_sw[13].ptr)
#define SSL_CTX_free (* (void (*)(SSL_CTX *)) ssl_sw[14].ptr)
#define SSL_load_error_strings (* (void (*)(void)) ssl_sw[15].ptr)
#define SSL_CTX_use_certificate_chain_file \
@@ -440,7 +440,7 @@ struct mg_context {
volatile int stop_flag; // Should we stop event loop
SSL_CTX *ssl_ctx; // SSL context
char *config[NUM_OPTIONS]; // Mongoose configuration parameters
- mg_callback_t user_callback; // User-defined callback function
+ mg_callback_pt user_callback; // User-defined callback function
void *user_data; // User-defined data
struct socket *listening_sockets;
@@ -1106,7 +1106,7 @@ struct dirent * readdir(DIR *dir) {
#define set_close_on_exec(fd) // No FD_CLOEXEC on Windows
-static int start_thread(struct mg_context *ctx, mg_thread_func_t f, void *p) {
+static int start_thread(struct mg_context *ctx, mg_thread_func_pt f, void *p) {
return _beginthread((void (__cdecl *)(void *)) f, 0, p) == -1L ? -1 : 0;
}
@@ -1219,7 +1219,7 @@ static void set_close_on_exec(int fd) {
(void) fcntl(fd, F_SETFD, FD_CLOEXEC);
}
-static int start_thread(struct mg_context *ctx, mg_thread_func_t func,
+static int start_thread(struct mg_context *ctx, mg_thread_func_pt func,
void *param) {
pthread_t thread_id;
pthread_attr_t attr;
@@ -4172,7 +4172,7 @@ void mg_stop(struct mg_context *ctx) {
#endif // _WIN32
}
-struct mg_context *mg_start(mg_callback_t user_callback, void *user_data,
+struct mg_context *mg_start(mg_callback_pt user_callback, void *user_data,
const char **options) {
struct mg_context *ctx;
const char *name, *value, *default_value;
@@ -4243,11 +4243,11 @@ struct mg_context *mg_start(mg_callback_
(void) pthread_cond_init(&ctx->sq_full, NULL);
// Start master (listening) thread
- start_thread(ctx, (mg_thread_func_t) master_thread, ctx);
+ start_thread(ctx, (mg_thread_func_pt) master_thread, ctx);
// Start worker threads
for (i = 0; i < atoi(ctx->config[NUM_THREADS]); i++) {
- if (start_thread(ctx, (mg_thread_func_t) worker_thread, ctx) != 0) {
+ if (start_thread(ctx, (mg_thread_func_pt) worker_thread, ctx) != 0) {
cry(fc(ctx), "Cannot start worker thread: %d", ERRNO);
} else {
ctx->num_threads++;
Modified: incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_activator.c?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_activator.c (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_activator.c Wed Jun 12 19:08:50 2013
@@ -34,11 +34,11 @@
struct activator {
apr_pool_t *pool;
- remote_service_admin_t admin;
- service_registration_t registration;
+ remote_service_admin_pt admin;
+ service_registration_pt registration;
};
-celix_status_t bundleActivator_create(bundle_context_t context, void **userData) {
+celix_status_t bundleActivator_create(bundle_context_pt context, void **userData) {
celix_status_t status = CELIX_SUCCESS;
apr_pool_t *parentPool = NULL;
apr_pool_t *pool = NULL;
@@ -65,10 +65,10 @@ celix_status_t bundleActivator_create(bu
return status;
}
-celix_status_t bundleActivator_start(void * userData, bundle_context_t context) {
+celix_status_t bundleActivator_start(void * userData, bundle_context_pt context) {
celix_status_t status = CELIX_SUCCESS;
struct activator *activator = userData;
- remote_service_admin_service_t remoteServiceAdmin = NULL;
+ remote_service_admin_service_pt remoteServiceAdmin = NULL;
status = remoteServiceAdmin_create(activator->pool, context, &activator->admin);
if (status == CELIX_SUCCESS) {
@@ -103,7 +103,7 @@ celix_status_t bundleActivator_start(voi
return status;
}
-celix_status_t bundleActivator_stop(void * userData, bundle_context_t context) {
+celix_status_t bundleActivator_stop(void * userData, bundle_context_pt context) {
celix_status_t status = CELIX_SUCCESS;
struct activator *activator = userData;
@@ -115,7 +115,7 @@ celix_status_t bundleActivator_stop(void
return status;
}
-celix_status_t bundleActivator_destroy(void * userData, bundle_context_t context) {
+celix_status_t bundleActivator_destroy(void * userData, bundle_context_pt context) {
celix_status_t status = CELIX_SUCCESS;
struct activator *activator = userData;
return status;
Modified: incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_http_impl.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_http_impl.c?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_http_impl.c (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_http_impl.c Wed Jun 12 19:08:50 2013
@@ -28,11 +28,11 @@
#include <celix_errno.h>
-typedef struct remote_service_admin_http *remote_service_admin_http_t;
+typedef struct remote_service_admin_http *remote_service_admin_http_pt;
struct remote_service_admin_http {
apr_pool_t *pool;
- bundle_context_t context;
+ bundle_context_pt context;
struct mg_context *ctx;
};
@@ -45,7 +45,7 @@ static const char *ajax_reply_start =
void *remoteServiceAdminHttp_callback(enum mg_event event, struct mg_connection *conn, const struct mg_request_info *request_info);
-celix_status_t remoteServiceAdminHttp_create(apr_pool_t *pool, bundle_context_t context, remote_service_admin_http_t *httpAdmin) {
+celix_status_t remoteServiceAdminHttp_create(apr_pool_t *pool, bundle_context_pt context, remote_service_admin_http_pt *httpAdmin) {
celix_status_t status = CELIX_SUCCESS;
*httpAdmin = apr_palloc(pool, sizeof(**httpAdmin));
@@ -74,7 +74,7 @@ celix_status_t remoteServiceAdminHttp_cr
void *remoteServiceAdminHttp_callback(enum mg_event event, struct mg_connection *conn, const struct mg_request_info *request_info) {
if (request_info->uri != NULL) {
printf("REMOTE_SERVICE_ADMIN: Handle request: %s\n", request_info->uri);
- remote_service_admin_t rsa = request_info->user_data;
+ remote_service_admin_pt rsa = request_info->user_data;
if (strncmp(request_info->uri, "/services/", 10) == 0) {
// uri = /services/myservice/call
@@ -100,13 +100,13 @@ void *remoteServiceAdminHttp_callback(en
char *reply = NULL;
remoteServiceAdmin_handleRequest(rsa, service, request, data, &reply);
- hash_map_iterator_t iter = hashMapIterator_create(rsa->exportedServices);
+ hash_map_iterator_pt iter = hashMapIterator_create(rsa->exportedServices);
while (hashMapIterator_hasNext(iter)) {
- hash_map_entry_t entry = hashMapIterator_nextEntry(iter);
- array_list_t exports = hashMapEntry_getValue(entry);
+ hash_map_entry_pt entry = hashMapIterator_nextEntry(iter);
+ array_list_pt exports = hashMapEntry_getValue(entry);
int expIt = 0;
for (expIt = 0; expIt < arrayList_size(exports); expIt++) {
- export_registration_t export = arrayList_get(exports, expIt);
+ export_registration_pt export = arrayList_get(exports, expIt);
if (strcmp(service, export->endpointDescription->service) == 0) {
char *reply = NULL;
export->endpoint->handleRequest(export->endpoint->endpoint, request, data, &reply);
Modified: incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_impl.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_impl.c?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_impl.c (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin_http/private/src/remote_service_admin_impl.c Wed Jun 12 19:08:50 2013
@@ -43,11 +43,11 @@
void *remoteServiceAdmin_callback(enum mg_event event, struct mg_connection *conn, const struct mg_request_info *request_info);
-celix_status_t remoteServiceAdmin_installEndpoint(remote_service_admin_t admin, export_registration_t registration, service_reference_t reference, char *interface);
-celix_status_t remoteServiceAdmin_createEndpointDescription(remote_service_admin_t admin, properties_t serviceProperties, properties_t endpointProperties, char *interface, endpoint_description_t *description);
-celix_status_t remoteServiceAdmin_getUUID(remote_service_admin_t rsa, char **uuidStr);
+celix_status_t remoteServiceAdmin_installEndpoint(remote_service_admin_pt admin, export_registration_pt registration, service_reference_pt reference, char *interface);
+celix_status_t remoteServiceAdmin_createEndpointDescription(remote_service_admin_pt admin, properties_pt serviceProperties, properties_pt endpointProperties, char *interface, endpoint_description_pt *description);
+celix_status_t remoteServiceAdmin_getUUID(remote_service_admin_pt rsa, char **uuidStr);
-celix_status_t remoteServiceAdmin_create(apr_pool_t *pool, bundle_context_t context, remote_service_admin_t *admin) {
+celix_status_t remoteServiceAdmin_create(apr_pool_t *pool, bundle_context_pt context, remote_service_admin_pt *admin) {
celix_status_t status = CELIX_SUCCESS;
*admin = apr_palloc(pool, sizeof(**admin));
@@ -72,24 +72,24 @@ celix_status_t remoteServiceAdmin_create
return status;
}
-celix_status_t remoteServiceAdmin_stop(remote_service_admin_t admin) {
+celix_status_t remoteServiceAdmin_stop(remote_service_admin_pt admin) {
celix_status_t status = CELIX_SUCCESS;
- hash_map_iterator_t iter = hashMapIterator_create(admin->exportedServices);
+ hash_map_iterator_pt iter = hashMapIterator_create(admin->exportedServices);
while (hashMapIterator_hasNext(iter)) {
- array_list_t exports = hashMapIterator_nextValue(iter);
+ array_list_pt exports = hashMapIterator_nextValue(iter);
int i;
for (i = 0; i < arrayList_size(exports); i++) {
- export_registration_t export = arrayList_get(exports, i);
+ export_registration_pt export = arrayList_get(exports, i);
exportRegistration_stopTracking(export);
}
}
iter = hashMapIterator_create(admin->importedServices);
while (hashMapIterator_hasNext(iter)) {
- array_list_t exports = hashMapIterator_nextValue(iter);
+ array_list_pt exports = hashMapIterator_nextValue(iter);
int i;
for (i = 0; i < arrayList_size(exports); i++) {
- import_registration_t export = arrayList_get(exports, i);
+ import_registration_pt export = arrayList_get(exports, i);
importRegistration_stopTracking(export);
}
}
@@ -99,14 +99,14 @@ celix_status_t remoteServiceAdmin_stop(r
-celix_status_t remoteServiceAdmin_handleRequest(remote_service_admin_t rsa, char *service, char *request, char *data, char **reply) {
- hash_map_iterator_t iter = hashMapIterator_create(rsa->exportedServices);
+celix_status_t remoteServiceAdmin_handleRequest(remote_service_admin_pt rsa, char *service, char *request, char *data, char **reply) {
+ hash_map_iterator_pt iter = hashMapIterator_create(rsa->exportedServices);
while (hashMapIterator_hasNext(iter)) {
- hash_map_entry_t entry = hashMapIterator_nextEntry(iter);
- array_list_t exports = hashMapEntry_getValue(entry);
+ hash_map_entry_pt entry = hashMapIterator_nextEntry(iter);
+ array_list_pt exports = hashMapEntry_getValue(entry);
int expIt = 0;
for (expIt = 0; expIt < arrayList_size(exports); expIt++) {
- export_registration_t export = arrayList_get(exports, expIt);
+ export_registration_pt export = arrayList_get(exports, expIt);
if (strcmp(service, export->endpointDescription->service) == 0) {
export->endpoint->handleRequest(export->endpoint->endpoint, request, data, reply);
}
@@ -115,13 +115,13 @@ celix_status_t remoteServiceAdmin_handle
return CELIX_SUCCESS;
}
-celix_status_t remoteServiceAdmin_exportService(remote_service_admin_t admin, service_reference_t reference, properties_t properties, array_list_t *registrations) {
+celix_status_t remoteServiceAdmin_exportService(remote_service_admin_pt admin, service_reference_pt reference, properties_pt properties, array_list_pt *registrations) {
celix_status_t status = CELIX_SUCCESS;
arrayList_create(admin->pool, registrations);
- service_registration_t registration = NULL;
+ service_registration_pt registration = NULL;
serviceReference_getServiceRegistration(reference, ®istration);
- properties_t serviceProperties = NULL;
+ properties_pt serviceProperties = NULL;
serviceRegistration_getProperties(registration, &serviceProperties);
char *exports = properties_get(serviceProperties, (char *) SERVICE_EXPORTED_INTERFACES);
char *provided = properties_get(serviceProperties, (char *) OBJECTCLASS);
@@ -130,7 +130,7 @@ celix_status_t remoteServiceAdmin_export
printf("RSA: No Services to export.\n");
} else {
printf("RSA: Export services (%s)\n", exports);
- array_list_t interfaces = NULL;
+ array_list_pt interfaces = NULL;
arrayList_create(admin->pool, &interfaces);
if (strcmp(string_trim(exports), "*") == 0) {
char *token;
@@ -160,7 +160,7 @@ celix_status_t remoteServiceAdmin_export
int iter = 0;
for (iter = 0; iter < arrayList_size(interfaces); iter++) {
char *interface = arrayList_get(interfaces, iter);
- export_registration_t registration = NULL;
+ export_registration_pt registration = NULL;
exportRegistration_create(admin->pool, reference, NULL, admin, admin->context, ®istration);
arrayList_add(*registrations, registration);
@@ -176,19 +176,19 @@ celix_status_t remoteServiceAdmin_export
return status;
}
-celix_status_t remoteServiceAdmin_installEndpoint(remote_service_admin_t admin, export_registration_t registration, service_reference_t reference, char *interface) {
+celix_status_t remoteServiceAdmin_installEndpoint(remote_service_admin_pt admin, export_registration_pt registration, service_reference_pt reference, char *interface) {
celix_status_t status = CELIX_SUCCESS;
- properties_t endpointProperties = properties_create();
- properties_t serviceProperties = NULL;
+ properties_pt endpointProperties = properties_create();
+ properties_pt serviceProperties = NULL;
- service_registration_t sRegistration = NULL;
+ service_registration_pt sRegistration = NULL;
serviceReference_getServiceRegistration(reference, &sRegistration);
serviceRegistration_getProperties(sRegistration, &serviceProperties);
- hash_map_iterator_t iter = hashMapIterator_create(serviceProperties);
+ hash_map_iterator_pt iter = hashMapIterator_create(serviceProperties);
while (hashMapIterator_hasNext(iter)) {
- hash_map_entry_t entry = hashMapIterator_nextEntry(iter);
+ hash_map_entry_pt entry = hashMapIterator_nextEntry(iter);
char *key = (char *) hashMapEntry_getKey(entry);
char *value = (char *) hashMapEntry_getValue(entry);
@@ -203,15 +203,15 @@ celix_status_t remoteServiceAdmin_instal
char *service = "/services/example";
properties_set(endpointProperties, (char *) SERVICE_LOCATION, apr_pstrdup(admin->pool, service));
- endpoint_description_t endpointDescription = NULL;
+ endpoint_description_pt endpointDescription = NULL;
remoteServiceAdmin_createEndpointDescription(admin, serviceProperties, endpointProperties, interface, &endpointDescription);
exportRegistration_setEndpointDescription(registration, endpointDescription);
return status;
}
-celix_status_t remoteServiceAdmin_createEndpointDescription(remote_service_admin_t admin, properties_t serviceProperties,
- properties_t endpointProperties, char *interface, endpoint_description_t *description) {
+celix_status_t remoteServiceAdmin_createEndpointDescription(remote_service_admin_pt admin, properties_pt serviceProperties,
+ properties_pt endpointProperties, char *interface, endpoint_description_pt *description) {
celix_status_t status = CELIX_SUCCESS;
*description = apr_palloc(admin->pool, sizeof(*description));
@@ -233,23 +233,23 @@ celix_status_t remoteServiceAdmin_create
return status;
}
-celix_status_t remoteServiceAdmin_getExportedServices(remote_service_admin_t admin, array_list_t *services) {
+celix_status_t remoteServiceAdmin_getExportedServices(remote_service_admin_pt admin, array_list_pt *services) {
celix_status_t status = CELIX_SUCCESS;
return status;
}
-celix_status_t remoteServiceAdmin_getImportedEndpoints(remote_service_admin_t admin, array_list_t *services) {
+celix_status_t remoteServiceAdmin_getImportedEndpoints(remote_service_admin_pt admin, array_list_pt *services) {
celix_status_t status = CELIX_SUCCESS;
return status;
}
-celix_status_t remoteServiceAdmin_importService(remote_service_admin_t admin, endpoint_description_t endpoint, import_registration_t *registration) {
+celix_status_t remoteServiceAdmin_importService(remote_service_admin_pt admin, endpoint_description_pt endpoint, import_registration_pt *registration) {
celix_status_t status = CELIX_SUCCESS;
printf("RSA: Import service %s\n", endpoint->service);
importRegistration_create(admin->pool, endpoint, admin, admin->context, registration);
- array_list_t importedRegs = hashMap_get(admin->importedServices, endpoint);
+ array_list_pt importedRegs = hashMap_get(admin->importedServices, endpoint);
if (importedRegs == NULL) {
arrayList_create(admin->pool, &importedRegs);
hashMap_put(admin->importedServices, endpoint, importedRegs);
@@ -263,7 +263,7 @@ celix_status_t remoteServiceAdmin_import
}
-celix_status_t exportReference_getExportedEndpoint(export_reference_t reference, endpoint_description_t *endpoint) {
+celix_status_t exportReference_getExportedEndpoint(export_reference_pt reference, endpoint_description_pt *endpoint) {
celix_status_t status = CELIX_SUCCESS;
*endpoint = reference->endpoint;
@@ -271,22 +271,22 @@ celix_status_t exportReference_getExport
return status;
}
-celix_status_t exportReference_getExportedService(export_reference_t reference) {
+celix_status_t exportReference_getExportedService(export_reference_pt reference) {
celix_status_t status = CELIX_SUCCESS;
return status;
}
-celix_status_t importReference_getImportedEndpoint(import_reference_t reference) {
+celix_status_t importReference_getImportedEndpoint(import_reference_pt reference) {
celix_status_t status = CELIX_SUCCESS;
return status;
}
-celix_status_t importReference_getImportedService(import_reference_t reference) {
+celix_status_t importReference_getImportedService(import_reference_pt reference) {
celix_status_t status = CELIX_SUCCESS;
return status;
}
-celix_status_t remoteServiceAdmin_getUUID(remote_service_admin_t rsa, char **uuidStr) {
+celix_status_t remoteServiceAdmin_getUUID(remote_service_admin_pt rsa, char **uuidStr) {
celix_status_t status = CELIX_SUCCESS;
status = bundleContext_getProperty(rsa->context, ENDPOINT_FRAMEWORK_UUID, uuidStr);
Modified: incubator/celix/trunk/remote_services/topology_manager/private/include/topology_manager.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/topology_manager/private/include/topology_manager.h?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/topology_manager/private/include/topology_manager.h (original)
+++ incubator/celix/trunk/remote_services/topology_manager/private/include/topology_manager.h Wed Jun 12 19:08:50 2013
@@ -31,25 +31,25 @@
#include "service_reference.h"
#include "bundle_context.h"
-typedef struct topology_manager *topology_manager_t;
+typedef struct topology_manager *topology_manager_pt;
-celix_status_t topologyManager_create(bundle_context_t context, apr_pool_t *pool, topology_manager_t *manager);
+celix_status_t topologyManager_create(bundle_context_pt context, apr_pool_t *pool, topology_manager_pt *manager);
-celix_status_t topologyManager_rsaAdding(void *handle, service_reference_t reference, void **service);
-celix_status_t topologyManager_rsaAdded(void *handle, service_reference_t reference, void *service);
-celix_status_t topologyManager_rsaModified(void *handle, service_reference_t reference, void *service);
-celix_status_t topologyManager_rsaRemoved(void *handle, service_reference_t reference, void *service);
+celix_status_t topologyManager_rsaAdding(void *handle, service_reference_pt reference, void **service);
+celix_status_t topologyManager_rsaAdded(void *handle, service_reference_pt reference, void *service);
+celix_status_t topologyManager_rsaModified(void *handle, service_reference_pt reference, void *service);
+celix_status_t topologyManager_rsaRemoved(void *handle, service_reference_pt reference, void *service);
-celix_status_t topologyManager_serviceChanged(void *listener, service_event_t event);
+celix_status_t topologyManager_serviceChanged(void *listener, service_event_pt event);
-celix_status_t topologyManager_endpointAdded(void *handle, endpoint_description_t endpoint, char *machtedFilter);
-celix_status_t topologyManager_endpointRemoved(void *handle, endpoint_description_t endpoint, char *machtedFilter);
+celix_status_t topologyManager_endpointAdded(void *handle, endpoint_description_pt endpoint, char *machtedFilter);
+celix_status_t topologyManager_endpointRemoved(void *handle, endpoint_description_pt endpoint, char *machtedFilter);
-celix_status_t topologyManager_importService(topology_manager_t manager, endpoint_description_t endpoint);
-celix_status_t topologyManager_exportService(topology_manager_t manager, service_reference_t reference);
-celix_status_t topologyManager_removeService(topology_manager_t manager, service_reference_t reference);
+celix_status_t topologyManager_importService(topology_manager_pt manager, endpoint_description_pt endpoint);
+celix_status_t topologyManager_exportService(topology_manager_pt manager, service_reference_pt reference);
+celix_status_t topologyManager_removeService(topology_manager_pt manager, service_reference_pt reference);
-celix_status_t topologyManager_listenerAdded(void *handle, array_list_t listeners);
-celix_status_t topologyManager_listenerRemoved(void *handle, array_list_t listeners);
+celix_status_t topologyManager_listenerAdded(void *handle, array_list_pt listeners);
+celix_status_t topologyManager_listenerRemoved(void *handle, array_list_pt listeners);
#endif /* TOPOLOGY_MANAGER_H_ */
Modified: incubator/celix/trunk/remote_services/topology_manager/private/src/activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/topology_manager/private/src/activator.c?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/topology_manager/private/src/activator.c (original)
+++ incubator/celix/trunk/remote_services/topology_manager/private/src/activator.c Wed Jun 12 19:08:50 2013
@@ -43,21 +43,21 @@
struct activator {
apr_pool_t *pool;
- bundle_context_t context;
+ bundle_context_pt context;
- topology_manager_t manager;
+ topology_manager_pt manager;
- service_tracker_t remoteServiceAdminTracker;
- service_listener_t serviceListener;
+ service_tracker_pt remoteServiceAdminTracker;
+ service_listener_pt serviceListener;
- service_registration_t endpointListenerService;
- service_registration_t hook;
+ service_registration_pt endpointListenerService;
+ service_registration_pt hook;
};
-static celix_status_t bundleActivator_createRSATracker(struct activator *activator, service_tracker_t *tracker);
-static celix_status_t bundleActivator_createServiceListener(struct activator *activator, service_listener_t *listener);
+static celix_status_t bundleActivator_createRSATracker(struct activator *activator, service_tracker_pt *tracker);
+static celix_status_t bundleActivator_createServiceListener(struct activator *activator, service_listener_pt *listener);
-celix_status_t bundleActivator_create(bundle_context_t context, void **userData) {
+celix_status_t bundleActivator_create(bundle_context_pt context, void **userData) {
celix_status_t status = CELIX_SUCCESS;
apr_pool_t *parentPool = NULL;
apr_pool_t *pool = NULL;
@@ -95,10 +95,10 @@ celix_status_t bundleActivator_create(bu
return status;
}
-static celix_status_t bundleActivator_createRSATracker(struct activator *activator, service_tracker_t *tracker) {
+static celix_status_t bundleActivator_createRSATracker(struct activator *activator, service_tracker_pt *tracker) {
celix_status_t status = CELIX_SUCCESS;
- service_tracker_customizer_t customizer = NULL;
+ service_tracker_customizer_pt customizer = NULL;
status = serviceTrackerCustomizer_create(activator->pool, activator->manager, topologyManager_rsaAdding,
topologyManager_rsaAdded, topologyManager_rsaModified, topologyManager_rsaRemoved, &customizer);
@@ -110,7 +110,7 @@ static celix_status_t bundleActivator_cr
return status;
}
-static celix_status_t bundleActivator_createServiceListener(struct activator *activator, service_listener_t *listener) {
+static celix_status_t bundleActivator_createServiceListener(struct activator *activator, service_listener_pt *listener) {
celix_status_t status = CELIX_SUCCESS;
apr_pool_t *pool;
apr_pool_create(&pool, activator->pool);
@@ -126,18 +126,18 @@ static celix_status_t bundleActivator_cr
return status;
}
-celix_status_t bundleActivator_start(void * userData, bundle_context_t context) {
+celix_status_t bundleActivator_start(void * userData, bundle_context_pt context) {
celix_status_t status = CELIX_SUCCESS;
struct activator *activator = userData;
apr_pool_t *pool = NULL;
apr_pool_create(&pool, activator->pool);
- endpoint_listener_t endpointListener = apr_palloc(pool, sizeof(*endpointListener));
+ endpoint_listener_pt endpointListener = apr_palloc(pool, sizeof(*endpointListener));
endpointListener->handle = activator->manager;
endpointListener->endpointAdded = topologyManager_endpointAdded;
endpointListener->endpointRemoved = topologyManager_endpointRemoved;
- properties_t props = properties_create();
+ properties_pt props = properties_create();
char *uuid = NULL;
remoteServicesUtils_getUUID(pool, context, &uuid);
char *scope = apr_pstrcat(pool, "(&(", OBJECTCLASS, "=*)(!(", ENDPOINT_FRAMEWORK_UUID, "=", uuid, ")))", NULL);
@@ -145,7 +145,7 @@ celix_status_t bundleActivator_start(voi
bundleContext_registerService(context, (char *) endpoint_listener_service, endpointListener, props, &activator->endpointListenerService);
- listener_hook_service_t hook = apr_palloc(pool, sizeof(*hook));
+ listener_hook_service_pt hook = apr_palloc(pool, sizeof(*hook));
hook->handle = activator->manager;
hook->added = topologyManager_listenerAdded;
hook->removed = topologyManager_listenerRemoved;
@@ -158,7 +158,7 @@ celix_status_t bundleActivator_start(voi
return status;
}
-celix_status_t bundleActivator_stop(void * userData, bundle_context_t context) {
+celix_status_t bundleActivator_stop(void * userData, bundle_context_pt context) {
celix_status_t status = CELIX_SUCCESS;
struct activator *activator = userData;
@@ -170,7 +170,7 @@ celix_status_t bundleActivator_stop(void
return status;
}
-celix_status_t bundleActivator_destroy(void * userData, bundle_context_t context) {
+celix_status_t bundleActivator_destroy(void * userData, bundle_context_pt context) {
celix_status_t status = CELIX_SUCCESS;
return status;
}
Modified: incubator/celix/trunk/remote_services/topology_manager/private/src/topology_manager.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/topology_manager/private/src/topology_manager.c?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/topology_manager/private/src/topology_manager.c (original)
+++ incubator/celix/trunk/remote_services/topology_manager/private/src/topology_manager.c Wed Jun 12 19:08:50 2013
@@ -44,13 +44,13 @@
struct topology_manager {
apr_pool_t *pool;
- bundle_context_t context;
+ bundle_context_pt context;
- array_list_t rsaList;
- hash_map_t exportedServices;
- hash_map_t importedServices;
+ array_list_pt rsaList;
+ hash_map_pt exportedServices;
+ hash_map_pt importedServices;
- hash_map_t importInterests;
+ hash_map_pt importInterests;
};
struct import_interest {
@@ -58,12 +58,12 @@ struct import_interest {
int refs;
};
-celix_status_t topologyManager_notifyListeners(topology_manager_t manager, remote_service_admin_service_t rsa, array_list_t registrations);
-celix_status_t topologyManager_notifyListenersOfRemoval(topology_manager_t manager, remote_service_admin_service_t rsa, export_registration_t export);
+celix_status_t topologyManager_notifyListeners(topology_manager_pt manager, remote_service_admin_service_pt rsa, array_list_pt registrations);
+celix_status_t topologyManager_notifyListenersOfRemoval(topology_manager_pt manager, remote_service_admin_service_pt rsa, export_registration_pt export);
-celix_status_t topologyManager_getUUID(topology_manager_t manager, char **uuidStr);
+celix_status_t topologyManager_getUUID(topology_manager_pt manager, char **uuidStr);
-celix_status_t topologyManager_create(bundle_context_t context, apr_pool_t *pool, topology_manager_t *manager) {
+celix_status_t topologyManager_create(bundle_context_pt context, apr_pool_t *pool, topology_manager_pt *manager) {
celix_status_t status = CELIX_SUCCESS;
*manager = apr_palloc(pool, sizeof(**manager));
@@ -82,18 +82,18 @@ celix_status_t topologyManager_create(bu
return status;
}
-celix_status_t topologyManager_rsaAdding(void * handle, service_reference_t reference, void **service) {
+celix_status_t topologyManager_rsaAdding(void * handle, service_reference_pt reference, void **service) {
celix_status_t status = CELIX_SUCCESS;
- topology_manager_t manager = handle;
+ topology_manager_pt manager = handle;
status = bundleContext_getService(manager->context, reference, service);
return status;
}
-celix_status_t topologyManager_rsaAdded(void * handle, service_reference_t reference, void * service) {
+celix_status_t topologyManager_rsaAdded(void * handle, service_reference_pt reference, void * service) {
celix_status_t status = CELIX_SUCCESS;
- topology_manager_t manager = handle;
+ topology_manager_pt manager = handle;
printf("TOPOLOGY_MANAGER: Added RSA\n");
arrayList_add(manager->rsaList, service);
@@ -101,15 +101,15 @@ celix_status_t topologyManager_rsaAdded(
return status;
}
-celix_status_t topologyManager_rsaModified(void * handle, service_reference_t reference, void * service) {
+celix_status_t topologyManager_rsaModified(void * handle, service_reference_pt reference, void * service) {
celix_status_t status = CELIX_SUCCESS;
- topology_manager_t manager = handle;
+ topology_manager_pt manager = handle;
return status;
}
-celix_status_t topologyManager_rsaRemoved(void * handle, service_reference_t reference, void * service) {
+celix_status_t topologyManager_rsaRemoved(void * handle, service_reference_pt reference, void * service) {
celix_status_t status = CELIX_SUCCESS;
- topology_manager_t manager = handle;
+ topology_manager_pt manager = handle;
printf("TOPOLOGY_MANAGER: Removed RSA\n");
arrayList_removeElement(manager->rsaList, service);
@@ -117,13 +117,13 @@ celix_status_t topologyManager_rsaRemove
return status;
}
-celix_status_t topologyManager_serviceChanged(void *listener, service_event_t event) {
+celix_status_t topologyManager_serviceChanged(void *listener, service_event_pt event) {
celix_status_t status = CELIX_SUCCESS;
- service_listener_t listen = listener;
- topology_manager_t manager = listen->handle;
- service_registration_t registration = NULL;
+ service_listener_pt listen = listener;
+ topology_manager_pt manager = listen->handle;
+ service_registration_pt registration = NULL;
serviceReference_getServiceRegistration(event->reference, ®istration);
- properties_t props = NULL;
+ properties_pt props = NULL;
serviceRegistration_getProperties(registration, &props);
char *name = properties_get(props, (char *) OBJECTCLASS);
char *export = properties_get(props, (char *) SERVICE_EXPORTED_INTERFACES);
@@ -143,9 +143,9 @@ celix_status_t topologyManager_serviceCh
return status;
}
-celix_status_t topologyManager_endpointAdded(void *handle, endpoint_description_t endpoint, char *machtedFilter) {
+celix_status_t topologyManager_endpointAdded(void *handle, endpoint_description_pt endpoint, char *machtedFilter) {
celix_status_t status = CELIX_SUCCESS;
- topology_manager_t manager = handle;
+ topology_manager_pt manager = handle;
printf("TOPOLOGY_MANAGER: Endpoint added\n");
status = topologyManager_importService(manager, endpoint);
@@ -153,18 +153,18 @@ celix_status_t topologyManager_endpointA
return status;
}
-celix_status_t topologyManager_endpointRemoved(void *handle, endpoint_description_t endpoint, char *machtedFilter) {
+celix_status_t topologyManager_endpointRemoved(void *handle, endpoint_description_pt endpoint, char *machtedFilter) {
celix_status_t status = CELIX_SUCCESS;
- topology_manager_t manager = handle;
+ topology_manager_pt manager = handle;
printf("TOPOLOGY_MANAGER: Endpoint removed\n");
if (hashMap_containsKey(manager->importedServices, endpoint)) {
- hash_map_t imports = hashMap_get(manager->importedServices, endpoint);
- hash_map_iterator_t iter = hashMapIterator_create(imports);
+ hash_map_pt imports = hashMap_get(manager->importedServices, endpoint);
+ hash_map_iterator_pt iter = hashMapIterator_create(imports);
while (hashMapIterator_hasNext(iter)) {
- hash_map_entry_t entry = hashMapIterator_nextEntry(iter);
- remote_service_admin_service_t rsa = hashMapEntry_getKey(entry);
- import_registration_t import = hashMapEntry_getValue(entry);
+ hash_map_entry_pt entry = hashMapIterator_nextEntry(iter);
+ remote_service_admin_service_pt rsa = hashMapEntry_getKey(entry);
+ import_registration_pt import = hashMapEntry_getValue(entry);
rsa->importRegistration_close(import);
}
}
@@ -172,16 +172,16 @@ celix_status_t topologyManager_endpointR
return status;
}
-celix_status_t topologyManager_exportService(topology_manager_t manager, service_reference_t reference) {
+celix_status_t topologyManager_exportService(topology_manager_pt manager, service_reference_pt reference) {
celix_status_t status = CELIX_SUCCESS;
- hash_map_t exports = hashMap_create(NULL, NULL, NULL, NULL);
+ hash_map_pt exports = hashMap_create(NULL, NULL, NULL, NULL);
hashMap_put(manager->exportedServices, reference, exports);
if (arrayList_size(manager->rsaList) == 0) {
char *symbolicName = NULL;
- module_t module = NULL;
- bundle_t bundle = NULL;
+ module_pt module = NULL;
+ bundle_pt bundle = NULL;
serviceReference_getBundle(reference, &bundle);
status = bundle_getCurrentModule(bundle, &module);
if (status == CELIX_SUCCESS) {
@@ -194,9 +194,9 @@ celix_status_t topologyManager_exportSer
int size = arrayList_size(manager->rsaList);
int iter = 0;
for (iter = 0; iter < size; iter++) {
- remote_service_admin_service_t rsa = arrayList_get(manager->rsaList, iter);
+ remote_service_admin_service_pt rsa = arrayList_get(manager->rsaList, iter);
- array_list_t endpoints = NULL;
+ array_list_pt endpoints = NULL;
status = rsa->exportService(rsa->admin, reference, NULL, &endpoints);
if (status == CELIX_SUCCESS) {
hashMap_put(exports, rsa, endpoints);
@@ -208,30 +208,30 @@ celix_status_t topologyManager_exportSer
return status;
}
-celix_status_t topologyManager_notifyListeners(topology_manager_t manager, remote_service_admin_service_t rsa, array_list_t registrations) {
+celix_status_t topologyManager_notifyListeners(topology_manager_pt manager, remote_service_admin_service_pt rsa, array_list_pt registrations) {
celix_status_t status = CELIX_SUCCESS;
- array_list_t endpointListeners = NULL;
+ array_list_pt endpointListeners = NULL;
status = bundleContext_getServiceReferences(manager->context, endpoint_listener_service, NULL, &endpointListeners);
if (status == CELIX_SUCCESS) {
if (endpointListeners != NULL) {
int eplIt;
for (eplIt = 0; eplIt < arrayList_size(endpointListeners); eplIt++) {
- service_reference_t eplRef = arrayList_get(endpointListeners, eplIt);
- service_registration_t registration = NULL;
+ service_reference_pt eplRef = arrayList_get(endpointListeners, eplIt);
+ service_registration_pt registration = NULL;
serviceReference_getServiceRegistration(eplRef, ®istration);
- properties_t props = NULL;
+ properties_pt props = NULL;
serviceRegistration_getProperties(registration, &props);
char *scope = properties_get(props, (char *) ENDPOINT_LISTENER_SCOPE);
- filter_t filter = filter_create(scope, manager->pool);
- endpoint_listener_t epl = NULL;
+ filter_pt filter = filter_create(scope, manager->pool);
+ endpoint_listener_pt epl = NULL;
status = bundleContext_getService(manager->context, eplRef, (void **) &epl);
if (status == CELIX_SUCCESS) {
int regIt;
for (regIt = 0; regIt < arrayList_size(registrations); regIt++) {
- export_registration_t export = arrayList_get(registrations, regIt);
- export_reference_t reference = NULL;
- endpoint_description_t endpoint = NULL;
+ export_registration_pt export = arrayList_get(registrations, regIt);
+ export_reference_pt reference = NULL;
+ endpoint_description_pt endpoint = NULL;
status = rsa->exportRegistration_getExportReference(export, &reference);
if (status == CELIX_SUCCESS) {
status = rsa->exportReference_getExportedEndpoint(reference, &endpoint);
@@ -252,9 +252,9 @@ celix_status_t topologyManager_notifyLis
return status;
}
-celix_status_t topologyManager_importService(topology_manager_t manager, endpoint_description_t endpoint) {
+celix_status_t topologyManager_importService(topology_manager_pt manager, endpoint_description_pt endpoint) {
celix_status_t status = CELIX_SUCCESS;
- hash_map_t imports = hashMap_create(NULL, NULL, NULL, NULL);
+ hash_map_pt imports = hashMap_create(NULL, NULL, NULL, NULL);
hashMap_put(manager->importedServices, endpoint, imports);
@@ -264,9 +264,9 @@ celix_status_t topologyManager_importSer
int size = arrayList_size(manager->rsaList);
int iter = 0;
for (iter = 0; iter < size; iter++) {
- remote_service_admin_service_t rsa = arrayList_get(manager->rsaList, iter);
+ remote_service_admin_service_pt rsa = arrayList_get(manager->rsaList, iter);
- import_registration_t import = NULL;
+ import_registration_pt import = NULL;
status = rsa->importService(rsa->admin, endpoint, &import);
if (status == CELIX_SUCCESS) {
hashMap_put(imports, rsa, import);
@@ -277,27 +277,27 @@ celix_status_t topologyManager_importSer
return status;
}
-celix_status_t topologyManager_removeService(topology_manager_t manager, service_reference_t reference) {
+celix_status_t topologyManager_removeService(topology_manager_pt manager, service_reference_pt reference) {
celix_status_t status = CELIX_SUCCESS;
- service_registration_t registration = NULL;
+ service_registration_pt registration = NULL;
serviceReference_getServiceRegistration(reference, ®istration);
- properties_t props = NULL;
+ properties_pt props = NULL;
serviceRegistration_getProperties(registration, &props);
char *name = properties_get(props, (char *) OBJECTCLASS);
printf("TOPOLOGY_MANAGER: Remove Service: %s.\n", name);
if (hashMap_containsKey(manager->exportedServices, reference)) {
- hash_map_t exports = hashMap_get(manager->exportedServices, reference);
- hash_map_iterator_t iter = hashMapIterator_create(exports);
+ hash_map_pt exports = hashMap_get(manager->exportedServices, reference);
+ hash_map_iterator_pt iter = hashMapIterator_create(exports);
while (hashMapIterator_hasNext(iter)) {
- hash_map_entry_t entry = hashMapIterator_nextEntry(iter);
- remote_service_admin_service_t rsa = hashMapEntry_getKey(entry);
- array_list_t exports = hashMapEntry_getValue(entry);
+ hash_map_entry_pt entry = hashMapIterator_nextEntry(iter);
+ remote_service_admin_service_pt rsa = hashMapEntry_getKey(entry);
+ array_list_pt exports = hashMapEntry_getValue(entry);
int exportsIter = 0;
for (exportsIter = 0; exportsIter < arrayList_size(exports); exportsIter++) {
- export_registration_t export = arrayList_get(exports, exportsIter);
+ export_registration_pt export = arrayList_get(exports, exportsIter);
rsa->exportRegistration_close(export);
topologyManager_notifyListenersOfRemoval(manager, rsa, export);
}
@@ -308,21 +308,21 @@ celix_status_t topologyManager_removeSer
return status;
}
-celix_status_t topologyManager_notifyListenersOfRemoval(topology_manager_t manager, remote_service_admin_service_t rsa, export_registration_t export) {
+celix_status_t topologyManager_notifyListenersOfRemoval(topology_manager_pt manager, remote_service_admin_service_pt rsa, export_registration_pt export) {
celix_status_t status = CELIX_SUCCESS;
- array_list_t endpointListeners = NULL;
+ array_list_pt endpointListeners = NULL;
status = bundleContext_getServiceReferences(manager->context, endpoint_listener_service, NULL, &endpointListeners);
if (status == CELIX_SUCCESS) {
if (endpointListeners != NULL) {
int eplIt;
for (eplIt = 0; eplIt < arrayList_size(endpointListeners); eplIt++) {
- service_reference_t eplRef = arrayList_get(endpointListeners, eplIt);
- endpoint_listener_t epl = NULL;
+ service_reference_pt eplRef = arrayList_get(endpointListeners, eplIt);
+ endpoint_listener_pt epl = NULL;
status = bundleContext_getService(manager->context, eplRef, (void **) &epl);
if (status == CELIX_SUCCESS) {
- export_reference_t reference = NULL;
- endpoint_description_t endpoint = NULL;
+ export_reference_pt reference = NULL;
+ endpoint_description_pt endpoint = NULL;
status = rsa->exportRegistration_getExportReference(export, &reference);
if (status == CELIX_SUCCESS) {
status = rsa->exportReference_getExportedEndpoint(reference, &endpoint);
@@ -338,7 +338,7 @@ celix_status_t topologyManager_notifyLis
return status;
}
-celix_status_t topologyManager_extendFilter(topology_manager_t manager, char *filter, char **updatedFilter) {
+celix_status_t topologyManager_extendFilter(topology_manager_pt manager, char *filter, char **updatedFilter) {
celix_status_t status = CELIX_SUCCESS;
apr_pool_t *pool = NULL;
apr_pool_create(&pool, manager->pool);
@@ -350,16 +350,16 @@ celix_status_t topologyManager_extendFil
return status;
}
-celix_status_t topologyManager_listenerAdded(void *handle, array_list_t listeners) {
+celix_status_t topologyManager_listenerAdded(void *handle, array_list_pt listeners) {
celix_status_t status = CELIX_SUCCESS;
- topology_manager_t manager = handle;
+ topology_manager_pt manager = handle;
int i;
for (i = 0; i < arrayList_size(listeners); i++) {
- listener_hook_info_t info = arrayList_get(listeners, i);
+ listener_hook_info_pt info = arrayList_get(listeners, i);
printf("TOPOLOGY_MANAGER: listener with filter \"%s\" added\n", info->filter);
- bundle_t bundle, self;
+ bundle_pt bundle, self;
bundleContext_getBundle(info->context, &bundle);
bundleContext_getBundle(manager->context, &self);
if (bundle == self) {
@@ -387,13 +387,13 @@ celix_status_t topologyManager_listenerA
return status;
}
-celix_status_t topologyManager_listenerRemoved(void *handle, array_list_t listeners) {
+celix_status_t topologyManager_listenerRemoved(void *handle, array_list_pt listeners) {
celix_status_t status = CELIX_SUCCESS;
- topology_manager_t manager = handle;
+ topology_manager_pt manager = handle;
int i;
for (i = 0; i < arrayList_size(listeners); i++) {
- listener_hook_info_t info = arrayList_get(listeners, i);
+ listener_hook_info_pt info = arrayList_get(listeners, i);
printf("TOPOLOGY_MANAGER: listener with filter \"%s\" removed\n", info->filter);
char *filter;
@@ -422,7 +422,7 @@ celix_status_t topologyManager_listenerR
return status;
}
-celix_status_t topologyManager_getUUID(topology_manager_t manager, char **uuidStr) {
+celix_status_t topologyManager_getUUID(topology_manager_pt manager, char **uuidStr) {
celix_status_t status = CELIX_SUCCESS;
apr_pool_t *pool = NULL;
apr_pool_create(&pool, manager->pool);
Modified: incubator/celix/trunk/remote_services/utils/private/src/remote_services_utils.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/utils/private/src/remote_services_utils.c?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/utils/private/src/remote_services_utils.c (original)
+++ incubator/celix/trunk/remote_services/utils/private/src/remote_services_utils.c Wed Jun 12 19:08:50 2013
@@ -32,7 +32,7 @@
#include "remote_constants.h"
#include "remote_services_utils.h"
-celix_status_t remoteServicesUtils_getUUID(apr_pool_t *pool, bundle_context_t context, char **uuidStr) {
+celix_status_t remoteServicesUtils_getUUID(apr_pool_t *pool, bundle_context_pt context, char **uuidStr) {
celix_status_t status = CELIX_SUCCESS;
status = bundleContext_getProperty(context, ENDPOINT_FRAMEWORK_UUID, uuidStr);
Modified: incubator/celix/trunk/remote_services/utils/public/include/remote_services_utils.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/utils/public/include/remote_services_utils.h?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/utils/public/include/remote_services_utils.h (original)
+++ incubator/celix/trunk/remote_services/utils/public/include/remote_services_utils.h Wed Jun 12 19:08:50 2013
@@ -31,6 +31,6 @@
#include <bundle_context.h>
#include <celix_errno.h>
-celix_status_t remoteServicesUtils_getUUID(apr_pool_t *pool, bundle_context_t context, char **uuidStr);
+celix_status_t remoteServicesUtils_getUUID(apr_pool_t *pool, bundle_context_pt context, char **uuidStr);
#endif /* REMOTE_SERVICES_UTILS_H_ */
Modified: incubator/celix/trunk/remote_shell/private/include/connection_listener.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_shell/private/include/connection_listener.h?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_shell/private/include/connection_listener.h (original)
+++ incubator/celix/trunk/remote_shell/private/include/connection_listener.h Wed Jun 12 19:08:50 2013
@@ -34,11 +34,11 @@
#include "remote_shell.h"
-typedef struct connection_listener *connection_listener_t;
+typedef struct connection_listener *connection_listener_pt;
-celix_status_t connectionListener_create(apr_pool_t *pool, remote_shell_t remoteShell, apr_size_t port, connection_listener_t *instance);
+celix_status_t connectionListener_create(apr_pool_t *pool, remote_shell_pt remoteShell, apr_size_t port, connection_listener_pt *instance);
-celix_status_t connectionListener_start(connection_listener_t instance);
-celix_status_t connectionListener_stop(connection_listener_t instance);
+celix_status_t connectionListener_start(connection_listener_pt instance);
+celix_status_t connectionListener_stop(connection_listener_pt instance);
#endif /* connectionListener_H_ */
Modified: incubator/celix/trunk/remote_shell/private/include/remote_shell.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_shell/private/include/remote_shell.h?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_shell/private/include/remote_shell.h (original)
+++ incubator/celix/trunk/remote_shell/private/include/remote_shell.h Wed Jun 12 19:08:50 2013
@@ -34,12 +34,12 @@
#include "shell_mediator.h"
-typedef struct remote_shell *remote_shell_t;
+typedef struct remote_shell *remote_shell_pt;
-celix_status_t remoteShell_create(apr_pool_t *pool, shell_mediator_t mediator, apr_size_t maximumConnections, remote_shell_t *instance);
+celix_status_t remoteShell_create(apr_pool_t *pool, shell_mediator_pt mediator, apr_size_t maximumConnections, remote_shell_pt *instance);
-celix_status_t remoteShell_addConnection(remote_shell_t instance, apr_socket_t *socket);
+celix_status_t remoteShell_addConnection(remote_shell_pt instance, apr_socket_t *socket);
-celix_status_t remoteShell_stopConnections(remote_shell_t instance);
+celix_status_t remoteShell_stopConnections(remote_shell_pt instance);
#endif /* REMOTE_SHELL_H_ */
Modified: incubator/celix/trunk/remote_shell/private/include/shell_mediator.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_shell/private/include/shell_mediator.h?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_shell/private/include/shell_mediator.h (original)
+++ incubator/celix/trunk/remote_shell/private/include/shell_mediator.h Wed Jun 12 19:08:50 2013
@@ -33,10 +33,10 @@
#include <bundle_context.h>
#include <celix_errno.h>
-typedef struct shell_mediator *shell_mediator_t;
+typedef struct shell_mediator *shell_mediator_pt;
-celix_status_t shellMediator_create(apr_pool_t *pool, bundle_context_t context, shell_mediator_t *instance);
+celix_status_t shellMediator_create(apr_pool_t *pool, bundle_context_pt context, shell_mediator_pt *instance);
-celix_status_t shellMediator_executeCommand(shell_mediator_t instance, char *command, apr_socket_t *socket);
+celix_status_t shellMediator_executeCommand(shell_mediator_pt instance, char *command, apr_socket_t *socket);
#endif /* shellMediator_H_ */
Modified: incubator/celix/trunk/remote_shell/private/src/activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_shell/private/src/activator.c?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_shell/private/src/activator.c (original)
+++ incubator/celix/trunk/remote_shell/private/src/activator.c Wed Jun 12 19:08:50 2013
@@ -44,18 +44,18 @@
struct bundle_instance {
apr_pool_t *pool;
- shell_mediator_t shellMediator;
- remote_shell_t remoteShell;
- connection_listener_t connectionListener;
+ shell_mediator_pt shellMediator;
+ remote_shell_pt remoteShell;
+ connection_listener_pt connectionListener;
};
-typedef struct bundle_instance *bundle_instance_t;
+typedef struct bundle_instance *bundle_instance_pt;
-static apr_size_t bundleActivator_getPort(bundle_context_t context);
-static apr_size_t bundleActivator_getMaximumConnections(bundle_context_t context);
-static apr_size_t bundleActivator_getProperty(bundle_context_t context, char * propertyName, apr_size_t defaultValue);
+static apr_size_t bundleActivator_getPort(bundle_context_pt context);
+static apr_size_t bundleActivator_getMaximumConnections(bundle_context_pt context);
+static apr_size_t bundleActivator_getProperty(bundle_context_pt context, char * propertyName, apr_size_t defaultValue);
-celix_status_t bundleActivator_create(bundle_context_t context, void **userData) {
+celix_status_t bundleActivator_create(bundle_context_pt context, void **userData) {
celix_status_t status = CELIX_SUCCESS;
apr_pool_t *ctxpool;
apr_pool_t *pool;
@@ -63,7 +63,7 @@ celix_status_t bundleActivator_create(bu
status = bundleContext_getMemoryPool(context, &ctxpool);
apr_pool_create(&pool, ctxpool);
if (status == CELIX_SUCCESS) {
- bundle_instance_t bi = (bundle_instance_t) apr_palloc(pool, sizeof(struct bundle_instance));
+ bundle_instance_pt bi = (bundle_instance_pt) apr_palloc(pool, sizeof(struct bundle_instance));
if (userData != NULL) {
bi->pool = pool;
bi->shellMediator = NULL;
@@ -77,9 +77,9 @@ celix_status_t bundleActivator_create(bu
return status;
}
-celix_status_t bundleActivator_start(void * userData, bundle_context_t context) {
+celix_status_t bundleActivator_start(void * userData, bundle_context_pt context) {
celix_status_t status = CELIX_SUCCESS;
- bundle_instance_t bi = (bundle_instance_t)userData;
+ bundle_instance_pt bi = (bundle_instance_pt)userData;
apr_size_t port = bundleActivator_getPort(context);
apr_size_t maxConn = bundleActivator_getMaximumConnections(context);
@@ -92,9 +92,9 @@ celix_status_t bundleActivator_start(voi
return status;
}
-celix_status_t bundleActivator_stop(void * userData, bundle_context_t context) {
+celix_status_t bundleActivator_stop(void * userData, bundle_context_pt context) {
celix_status_t status = CELIX_SUCCESS;
- bundle_instance_t bi = (bundle_instance_t)userData;
+ bundle_instance_pt bi = (bundle_instance_pt)userData;
connectionListener_stop(bi->connectionListener);
remoteShell_stopConnections(bi->remoteShell);
@@ -102,19 +102,19 @@ celix_status_t bundleActivator_stop(void
return status;
}
-celix_status_t bundleActivator_destroy(void * userData, bundle_context_t context) {
+celix_status_t bundleActivator_destroy(void * userData, bundle_context_pt context) {
return CELIX_SUCCESS;
}
-static apr_size_t bundleActivator_getPort(bundle_context_t context) {
+static apr_size_t bundleActivator_getPort(bundle_context_pt context) {
return bundleActivator_getProperty(context, REMOTE_SHELL_TELNET_PORT_PROPERTY_NAME, DEFAULT_REMOTE_SHELL_TELNET_PORT);
}
-static apr_size_t bundleActivator_getMaximumConnections(bundle_context_t context) {
+static apr_size_t bundleActivator_getMaximumConnections(bundle_context_pt context) {
return bundleActivator_getProperty(context, REMOTE_SHELL_TELNET_MAXCONN_PROPERTY_NAME, DEFAULT_REMOTE_SHELL_TELNET_MAXCONN);
}
-static apr_size_t bundleActivator_getProperty(bundle_context_t context, char * propertyName, apr_size_t defaultValue) {
+static apr_size_t bundleActivator_getProperty(bundle_context_pt context, char * propertyName, apr_size_t defaultValue) {
apr_size_t value;
char *strValue = NULL;
Modified: incubator/celix/trunk/remote_shell/private/src/connection_listener.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_shell/private/src/connection_listener.c?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_shell/private/src/connection_listener.c (original)
+++ incubator/celix/trunk/remote_shell/private/src/connection_listener.c Wed Jun 12 19:08:50 2013
@@ -44,7 +44,7 @@ struct connection_listener {
//constant
apr_pool_t *pool;
apr_size_t port;
- remote_shell_t remoteShell;
+ remote_shell_pt remoteShell;
apr_thread_mutex_t *mutex;
//protected by mutex
@@ -53,9 +53,9 @@ struct connection_listener {
};
static void* APR_THREAD_FUNC connection_listener_thread(apr_thread_t *thread, void *data);
-static apr_status_t connectionListener_cleanup(connection_listener_t instance);
+static apr_status_t connectionListener_cleanup(connection_listener_pt instance);
-celix_status_t connectionListener_create(apr_pool_t *pool, remote_shell_t remoteShell, apr_size_t port, connection_listener_t *instance) {
+celix_status_t connectionListener_create(apr_pool_t *pool, remote_shell_pt remoteShell, apr_size_t port, connection_listener_pt *instance) {
celix_status_t status = CELIX_SUCCESS;
(*instance) = apr_palloc(pool, sizeof(**instance));
if ((*instance) != NULL) {
@@ -74,7 +74,7 @@ celix_status_t connectionListener_create
return status;
}
-celix_status_t connectionListener_start(connection_listener_t instance) {
+celix_status_t connectionListener_start(connection_listener_pt instance) {
celix_status_t status = CELIX_SUCCESS;
apr_thread_mutex_lock(instance->mutex);
@@ -90,7 +90,7 @@ celix_status_t connectionListener_start(
return status;
}
-celix_status_t connectionListener_stop(connection_listener_t instance) {
+celix_status_t connectionListener_stop(connection_listener_pt instance) {
celix_status_t status = CELIX_SUCCESS;
apr_thread_t *thread = NULL;
apr_pollset_t *pollset = NULL;
@@ -127,7 +127,7 @@ celix_status_t connectionListener_stop(c
static void* APR_THREAD_FUNC connection_listener_thread(apr_thread_t *thread, void *data) {
apr_status_t status = APR_SUCCESS;
- connection_listener_t instance = data;
+ connection_listener_pt instance = data;
apr_sockaddr_t *listenAddress = NULL;
apr_socket_t *listenSocket = NULL;
@@ -199,7 +199,7 @@ static void* APR_THREAD_FUNC connection_
return NULL;
}
-static apr_status_t connectionListener_cleanup(connection_listener_t instance) {
+static apr_status_t connectionListener_cleanup(connection_listener_pt instance) {
celix_status_t status = CELIX_SUCCESS;
status = connectionListener_stop(instance);
return APR_SUCCESS;
Modified: incubator/celix/trunk/remote_shell/private/src/remote_shell.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_shell/private/src/remote_shell.c?rev=1492377&r1=1492376&r2=1492377&view=diff
==============================================================================
--- incubator/celix/trunk/remote_shell/private/src/remote_shell.c (original)
+++ incubator/celix/trunk/remote_shell/private/src/remote_shell.c Wed Jun 12 19:08:50 2013
@@ -47,31 +47,31 @@
struct remote_shell {
apr_pool_t *pool;
- shell_mediator_t mediator;
+ shell_mediator_pt mediator;
apr_thread_mutex_t *mutex;
apr_int64_t maximumConnections;
//protected by mutex
apr_thread_pool_t *threadPool;
- array_list_t connections;
+ array_list_pt connections;
};
struct connection {
- remote_shell_t parent;
+ remote_shell_pt parent;
apr_socket_t *socket;
apr_pool_t *pool;
apr_pollset_t *pollset;
};
-typedef struct connection *connection_t;
+typedef struct connection *connection_pt;
-static apr_status_t remoteShell_cleanup(remote_shell_t instance); //gets called from apr pool cleanup
+static apr_status_t remoteShell_cleanup(remote_shell_pt instance); //gets called from apr pool cleanup
-static celix_status_t remoteShell_connection_print(connection_t connection, char * text);
-static celix_status_t remoteShell_connection_execute(connection_t connection, char *command);
+static celix_status_t remoteShell_connection_print(connection_pt connection, char * text);
+static celix_status_t remoteShell_connection_execute(connection_pt connection, char *command);
static void* APR_THREAD_FUNC remoteShell_connection_run(apr_thread_t *thread, void *data);
-celix_status_t remoteShell_create(apr_pool_t *pool, shell_mediator_t mediator, apr_size_t maximumConnections, remote_shell_t *instance) {
+celix_status_t remoteShell_create(apr_pool_t *pool, shell_mediator_pt mediator, apr_size_t maximumConnections, remote_shell_pt *instance) {
celix_status_t status = CELIX_SUCCESS;
(*instance) = apr_palloc(pool, sizeof(**instance));
if ((*instance) != NULL) {
@@ -93,7 +93,7 @@ celix_status_t remoteShell_create(apr_po
return status;
}
-static apr_status_t remoteShell_cleanup(remote_shell_t instance) {
+static apr_status_t remoteShell_cleanup(remote_shell_pt instance) {
remoteShell_stopConnections(instance);
apr_thread_mutex_lock(instance->mutex);
@@ -103,10 +103,10 @@ static apr_status_t remoteShell_cleanup(
return APR_SUCCESS;
}
-celix_status_t remoteShell_addConnection(remote_shell_t instance, apr_socket_t *socket) {
+celix_status_t remoteShell_addConnection(remote_shell_pt instance, apr_socket_t *socket) {
celix_status_t status = CELIX_SUCCESS;
apr_pool_t *pool = apr_socket_pool_get(socket);
- connection_t connection = apr_palloc(pool, sizeof(struct connection));
+ connection_pt connection = apr_palloc(pool, sizeof(struct connection));
if (connection != NULL) {
connection->parent = instance;
connection->socket = socket;
@@ -134,7 +134,7 @@ celix_status_t remoteShell_addConnection
return status;
}
-celix_status_t remoteShell_stopConnections(remote_shell_t instance) {
+celix_status_t remoteShell_stopConnections(remote_shell_pt instance) {
celix_status_t status = CELIX_SUCCESS;
apr_status_t wakeupStatus = APR_SUCCESS;
char error[64];
@@ -144,7 +144,7 @@ celix_status_t remoteShell_stopConnectio
apr_thread_mutex_lock(instance->mutex);
length = arrayList_size(instance->connections);
for (i = 0; i < length; i += 1) {
- connection_t connection = arrayList_get(instance->connections, i);
+ connection_pt connection = arrayList_get(instance->connections, i);
wakeupStatus = apr_pollset_wakeup(connection->pollset);
if (wakeupStatus != APR_SUCCESS) {
apr_strerror(wakeupStatus, error, 64);
@@ -159,7 +159,7 @@ celix_status_t remoteShell_stopConnectio
void *APR_THREAD_FUNC remoteShell_connection_run(apr_thread_t *thread, void *data) {
celix_status_t status = CELIX_SUCCESS;
- connection_t connection = data;
+ connection_pt connection = data;
apr_size_t len;
char buff[COMMAND_BUFF_SIZE];
@@ -220,7 +220,7 @@ void *APR_THREAD_FUNC remoteShell_connec
return NULL;
}
-static celix_status_t remoteShell_connection_execute(connection_t connection, char *command) {
+static celix_status_t remoteShell_connection_execute(connection_pt connection, char *command) {
celix_status_t status;
apr_pool_t *workPool = NULL;
@@ -245,7 +245,7 @@ static celix_status_t remoteShell_connec
return status;
}
-celix_status_t remoteShell_connection_print(connection_t connection, char *text) {
+celix_status_t remoteShell_connection_print(connection_pt connection, char *text) {
apr_size_t len = strlen(text);
return apr_socket_send(connection->socket, text, &len);
}