Author: abroekhuis
Date: Wed Jun 4 14:04:48 2014
New Revision: 1600220
URL: http://svn.apache.org/r1600220
Log:
CELIX-119: Updated launcher and log service.
Modified:
incubator/celix/trunk/examples/CMakeLists.txt
incubator/celix/trunk/framework/private/src/bundle_archive.c
incubator/celix/trunk/framework/private/src/framework.c
incubator/celix/trunk/launcher/private/src/launcher.c
incubator/celix/trunk/log_service/private/src/log.c
Modified: incubator/celix/trunk/examples/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/examples/CMakeLists.txt?rev=1600220&r1=1600219&r2=1600220&view=diff
==============================================================================
--- incubator/celix/trunk/examples/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/CMakeLists.txt Wed Jun 4 14:04:48 2014
@@ -14,7 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-celix_subproject(EXAMPLES "Option to enable building the Examples" "OFF" DEPS
FRAMEWORK LAUNCHER SHELL_TUI LOG_WRITER DEPENDENCY_MANAGER)
+celix_subproject(EXAMPLES "Option to enable building the Examples" "OFF" DEPS
FRAMEWORK LAUNCHER SHELL_TUI)
if (EXAMPLES)
add_subdirectory(hello_world)
add_subdirectory(hello_world_test)
Modified: incubator/celix/trunk/framework/private/src/bundle_archive.c
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/src/bundle_archive.c?rev=1600220&r1=1600219&r2=1600220&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/src/bundle_archive.c (original)
+++ incubator/celix/trunk/framework/private/src/bundle_archive.c Wed Jun 4
14:04:48 2014
@@ -147,13 +147,13 @@ celix_status_t bundleArchive_create(fram
static apr_status_t bundleArchive_destroy(void *archiveP) {
apr_status_t status = APR_SUCCESS;
bundle_archive_pt archive = archiveP;
- archive = NULL;
if (archive->revisions != NULL) {
linkedList_destroy(archive->revisions);
}
+ archive = NULL;
- framework_logIfError(archive->logger, status, NULL, "Could not create
archive");
+ framework_logIfError(logger, status, NULL, "Could not create archive");
return status;
}
Modified: incubator/celix/trunk/framework/private/src/framework.c
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/src/framework.c?rev=1600220&r1=1600219&r2=1600220&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/src/framework.c (original)
+++ incubator/celix/trunk/framework/private/src/framework.c Wed Jun 4 14:04:48
2014
@@ -30,7 +30,6 @@
#include <sys/types.h>
#include "celixbool.h"
#include <math.h>
-#include <apr_file_io.h>
#include <apr_general.h>
#include <apr_strings.h>
#include <apr_uuid.h>
Modified: incubator/celix/trunk/launcher/private/src/launcher.c
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/launcher/private/src/launcher.c?rev=1600220&r1=1600219&r2=1600220&view=diff
==============================================================================
--- incubator/celix/trunk/launcher/private/src/launcher.c (original)
+++ incubator/celix/trunk/launcher/private/src/launcher.c Wed Jun 4 14:04:48
2014
@@ -87,7 +87,7 @@ int main(void) {
linked_list_iterator_pt iter = NULL;
unsigned int i;
- linkedList_create(pool, &bundles);
+ linkedList_create(&bundles);
result = strtok(autoStart, delims);
while (result != NULL) {
char * location = apr_pstrdup(memoryPool, result);
@@ -112,6 +112,7 @@ int main(void) {
linkedListIterator_remove(iter);
}
linkedListIterator_destroy(iter);
+ linkedList_destroy(bundles);
for (i = 0; i < arrayList_size(installed); i++) {
bundle_pt bundle = (bundle_pt) arrayList_get(installed, i);
Modified: incubator/celix/trunk/log_service/private/src/log.c
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/log_service/private/src/log.c?rev=1600220&r1=1600219&r2=1600220&view=diff
==============================================================================
--- incubator/celix/trunk/log_service/private/src/log.c (original)
+++ incubator/celix/trunk/log_service/private/src/log.c Wed Jun 4 14:04:48 2014
@@ -65,7 +65,7 @@ celix_status_t log_create(apr_pool_t *po
apr_status_t apr_status;
apr_pool_pre_cleanup_register(pool, *logger, log_destroy);
- linkedList_create(pool, &(*logger)->entries);
+ linkedList_create(&(*logger)->entries);
apr_thread_mutex_create(&(*logger)->lock, APR_THREAD_MUTEX_UNNESTED,
pool);
(*logger)->pool = pool;
@@ -103,6 +103,7 @@ apr_status_t log_destroy(void *logp) {
apr_thread_cond_destroy(log->entriesToDeliver);
arrayList_destroy(log->listenerEntries);
arrayList_destroy(log->listeners);
+ linkedList_destroy(log->entries);
apr_thread_mutex_destroy(log->lock);
return APR_SUCCESS;
@@ -125,7 +126,7 @@ celix_status_t log_addEntry(log_pt log,
celix_status_t log_getEntries(log_pt log, apr_pool_t *memory_pool,
linked_list_pt *list) {
linked_list_pt entries = NULL;
- if (linkedList_create(memory_pool, &entries) == CELIX_SUCCESS) {
+ if (linkedList_create(&entries) == CELIX_SUCCESS) {
linked_list_iterator_pt iter = NULL;
apr_thread_mutex_lock(log->lock);
