From caa454fe2c6c8f31cb22fa42bdf983cfb7bbecaf Mon Sep 17 00:00:00 2001 From: "jaesick.shin" Date: Mon, 23 May 2016 17:42:27 +0900 Subject: [PATCH] changed log in provider side this patch includes log change in notification provider from printf to NS_LOG and NS_LOG_V. Change-Id: I4c255d0442165acb93b22c07788d375e27c299a9 Signed-off-by: jaesick.shin Reviewed-on: https://gerrit.iotivity.org/gerrit/8279 Tested-by: jenkins-iotivity Reviewed-by: Uze Choi --- service/SConscript | 2 +- service/notification/SConscript | 1 + .../src/provider/NSProviderDiscovery.c | 10 ++ .../src/provider/NSProviderInterface.c | 32 +++++- .../notification/src/provider/NSProviderListener.c | 48 ++++++-- .../src/provider/NSProviderNotification.c | 83 ++++++++------ .../notification/src/provider/NSProviderResource.c | 24 +++- .../src/provider/NSProviderScheduler.c | 21 +++- .../src/provider/NSProviderSubscription.c | 84 ++++++++------ .../notification/src/provider/NSProviderSystem.c | 2 + .../notification/src/provider/NSProviderSystem.h | 1 + .../provider/cache/linux/NSProviderMemoryCache.c | 123 +++++++++++++-------- 12 files changed, 297 insertions(+), 134 deletions(-) diff --git a/service/SConscript b/service/SConscript index bbd66d4..71b82b9 100755 --- a/service/SConscript +++ b/service/SConscript @@ -43,7 +43,7 @@ if target_os not in ['arduino','darwin', 'ios']: if target_os in ['linux']: SConscript('scene-manager/SConscript') - if target_os in ['linux']: + if target_os in ['linux','android']: SConscript('notification/SConscript') # Build simulator module diff --git a/service/notification/SConscript b/service/notification/SConscript index 777c06f..2459bcd 100644 --- a/service/notification/SConscript +++ b/service/notification/SConscript @@ -45,6 +45,7 @@ target_os = env.get('TARGET_OS') notification_env.AppendUnique(CPPPATH = ['include']) notification_env.AppendUnique(CPPPATH = ['src/common']) notification_env.AppendUnique(CPPPATH = ['src/provider']) +notification_env.AppendUnique(CPPPATH = ['src/provider/cache/linux']) notification_env.AppendUnique(CPPPATH = ['../../resource/csdk/stack/include']) notification_env.AppendUnique(CPPPATH = ['../../resource/csdk/connectivity/api']) diff --git a/service/notification/src/provider/NSProviderDiscovery.c b/service/notification/src/provider/NSProviderDiscovery.c index 94652b0..929a2b3 100644 --- a/service/notification/src/provider/NSProviderDiscovery.c +++ b/service/notification/src/provider/NSProviderDiscovery.c @@ -23,28 +23,34 @@ NSResult NSStartPresence() { OIC_LOG(INFO, DISCOVERY_TAG, "NSStartPresence()"); + NS_LOG(INFO, "NSStartPresence()"); if (OCStartPresence(0) != OC_STACK_OK) { OIC_LOG(INFO, DISCOVERY_TAG, "NSStartPresence() NS_ERROR"); + NS_LOG(INFO, "NSStartPresence() NS_ERROR"); return NS_ERROR; } OIC_LOG(INFO, DISCOVERY_TAG, "NSStartPresence() NS_OK"); + NS_LOG(INFO, "NSStartPresence() NS_OK"); return NS_OK; } NSResult NSStopPresence() { OIC_LOG(INFO, DISCOVERY_TAG, "NSStopPresence()"); + NS_LOG(INFO, "NSStopPresence()"); if (OCStopPresence() != OC_STACK_OK) { OIC_LOG(INFO, DISCOVERY_TAG, "NSStopPresence() NS_ERROR"); + NS_LOG(INFO, "NSStopPresence() NS_ERROR"); return NS_ERROR; } OIC_LOG(INFO, DISCOVERY_TAG, "NSStopPresence() NS_OK"); + NS_LOG(INFO, "NSStopPresence() NS_OK"); return NS_OK; } @@ -53,6 +59,7 @@ void * NSDiscoverySchedule(void * ptr) if (ptr == NULL) { OIC_LOG(INFO, DISCOVERY_TAG, "Create NSDiscoverySchedule"); + NS_LOG(INFO, "Create NSDiscoverySchedule"); } while (NSIsRunning[DISCOVERY_SCHEDULER]) @@ -68,12 +75,15 @@ void * NSDiscoverySchedule(void * ptr) switch (node->taskType) { case TASK_START_PRESENCE: + NS_LOG(INFO, "CASE TASK_START_PRESENCE : "); NSStartPresence(); break; case TASK_STOP_PRESENCE: + NS_LOG(INFO, "CASE TASK_STOP_PRESENCE : "); NSStopPresence(); break; case TASK_REGISTER_RESOURCE: + NS_LOG(INFO, "CASE TASK_REGISTER_RESOURCE : "); NSRegisterResource(); break; default: diff --git a/service/notification/src/provider/NSProviderInterface.c b/service/notification/src/provider/NSProviderInterface.c index 558e1e5..21bb1fc 100644 --- a/service/notification/src/provider/NSProviderInterface.c +++ b/service/notification/src/provider/NSProviderInterface.c @@ -33,33 +33,42 @@ pthread_mutex_t NSCacheMutex; void NSRegisterSubscribeRequestCb(NSSubscribeRequestCallback subscribeRequestCb) { + NS_LOG(DEBUG, "NSRegisterSubscribeRequestCb - IN"); g_subscribeRequestCb = subscribeRequestCb; + NS_LOG(DEBUG, "NSRegisterSubscribeRequestCb - OUT"); } void NSRegisterSyncCb(NSSyncCallback syncCb) { + NS_LOG(DEBUG, "NSRegisterSyncCb - IN"); g_syncCb = syncCb; + NS_LOG(DEBUG, "NSRegisterSyncCb - OUT"); } void NSSubscribeRequestCb(NSConsumer *consumer) { + NS_LOG(DEBUG, "NSSubscribeRequestCb - IN"); g_subscribeRequestCb(consumer); + NS_LOG(DEBUG, "NSSubscribeRequestCb - OUT"); } void NSSyncCb(NSSync *sync) { + NS_LOG(DEBUG, "NSSyncCb - IN"); g_syncCb(sync); + NS_LOG(DEBUG, "NSSyncCb - OUT"); } NSResult NSStartProvider(NSAccessPolicy policy, NSSubscribeRequestCallback subscribeRequestCb, NSSyncCallback syncCb) { OIC_LOG(INFO, INTERFACE_TAG, "Notification Service Start Provider.."); - + NS_LOG(DEBUG, "NSStartProvider - IN"); NSSetSubscriptionAcceptPolicy(policy); if (!initProvider) { + NS_LOG(DEBUG, "Init Provider"); initProvider = true; NSSetList(); @@ -76,51 +85,66 @@ NSResult NSStartProvider(NSAccessPolicy policy, NSSubscribeRequestCallback subsc NSPushQueue(DISCOVERY_SCHEDULER, TASK_START_PRESENCE, NULL); NSPushQueue(DISCOVERY_SCHEDULER, TASK_REGISTER_RESOURCE, NULL); + NS_LOG(DEBUG, "NSStartProvider - OUT"); + return NS_OK; } void NSSetList() { + NS_LOG(DEBUG, "NSSetList - IN"); pthread_mutex_init(&NSCacheMutex, NULL); NSInitSubscriptionList(); NSInitMessageList(); + NS_LOG(DEBUG, "NSSetList - OUT"); } NSResult NSStopProvider() { + NS_LOG(DEBUG, "NSStopProvider - IN"); NSRegisterSubscribeRequestCb((NSSubscribeRequestCallback)NULL); NSRegisterSyncCb((NSSyncCallback)NULL); initProvider = false; + NS_LOG(DEBUG, "NSStopProvider - OUT"); return NS_OK; } NSResult NSSendNotification(NSMessage *msg) { OIC_LOG(INFO, INTERFACE_TAG, "Send Notification"); + NS_LOG(DEBUG, "NSSendNotification - IN"); NSPushQueue(NOTIFICATION_SCHEDULER, TASK_SEND_NOTIFICATION, msg); + NS_LOG(DEBUG, "NSSendNotification - OUT"); return NS_OK; } NSResult NSProviderReadCheck(NSMessage *msg) { OIC_LOG(INFO, INTERFACE_TAG, "Read Sync"); + NS_LOG(DEBUG, "NSProviderReadCheck - IN"); NSPushQueue(NOTIFICATION_SCHEDULER, TASK_SEND_READ, msg); + NS_LOG(DEBUG, "NSProviderReadCheck - OUT"); return NS_OK; } NSResult NSAccept(NSConsumer *consumer, bool accepted) { OIC_LOG(INFO, INTERFACE_TAG, "Response Acceptance"); + NS_LOG(DEBUG, "NSAccept - IN"); if(accepted) { + NS_LOG(DEBUG, "accepted is true - ALLOW"); NSPushQueue(SUBSCRIPTION_SCHEDULER, TASK_SEND_ALLOW, consumer); + } else { + NS_LOG(DEBUG, "accepted is false - DENY"); NSPushQueue(SUBSCRIPTION_SCHEDULER, TASK_SEND_DENY, consumer); } + NS_LOG(DEBUG, "NSAccept - OUT"); return NS_OK; } @@ -129,6 +153,7 @@ void * NSResponseSchedule(void * ptr) if (ptr == NULL) { OIC_LOG(INFO, INTERFACE_TAG, "Init NSResponseSchedule"); + NS_LOG(DEBUG, "Create NSReponseSchedule"); } while (NSIsRunning[RESPONSE_SCHEDULER]) @@ -145,7 +170,7 @@ void * NSResponseSchedule(void * ptr) { case TASK_CB_SUBSCRIPTION: { - printf("before - TASK_CB_SUBSCRIPTION :\n"); + NS_LOG(DEBUG, "CASE TASK_CB_SUBSCRIPTION : "); OCEntityHandlerRequest * request = (OCEntityHandlerRequest*)node->taskData; NSConsumer consumer; @@ -155,11 +180,12 @@ void * NSResponseSchedule(void * ptr) consumer.mUserData = obId; NSSubscribeRequestCb(&consumer); - printf("after - TASK_CB_SUBSCRIPTION :\n"); + break; } case TASK_CB_SYNC: { + NS_LOG(DEBUG, "CASE TASK_CB_SYNC : "); NSSync * sync = (NSSync*)node->taskData; NSSyncCb(sync); break; diff --git a/service/notification/src/provider/NSProviderListener.c b/service/notification/src/provider/NSProviderListener.c index 9026451..a0f439e 100644 --- a/service/notification/src/provider/NSProviderListener.c +++ b/service/notification/src/provider/NSProviderListener.c @@ -24,6 +24,7 @@ OCEntityHandlerResult NSEntityHandlerNotificationCb(OCEntityHandlerFlag flag, OCEntityHandlerRequest *entityHandlerRequest, void* callback) { OIC_LOG_V (INFO, LISTENER_TAG, "Inside entity handler - flags: 0x%x", flag); + NS_LOG(DEBUG, "NSEntityHandlerNotificationCb - IN"); OCEntityHandlerResult ehResult = OC_EH_OK; OCEntityHandlerResponse response = @@ -54,6 +55,7 @@ OCEntityHandlerResult NSEntityHandlerNotificationCb(OCEntityHandlerFlag flag, if (OC_REST_GET == entityHandlerRequest->method) { OIC_LOG (INFO, LISTENER_TAG, "Received OC_REST_GET from client"); + NS_LOG(DEBUG, "NSEntityHandlerNotificationCb - OC_REST_GET"); NSPushQueue(SUBSCRIPTION_SCHEDULER, TASK_SEND_POLICY, (void *)entityHandlerRequest); ehResult = OC_EH_OK; @@ -62,16 +64,19 @@ OCEntityHandlerResult NSEntityHandlerNotificationCb(OCEntityHandlerFlag flag, else if (OC_REST_PUT == entityHandlerRequest->method) { OIC_LOG (INFO, LISTENER_TAG, "Received OC_REST_PUT from client"); + NS_LOG(DEBUG, "NSEntityHandlerNotificationCb - OC_REST_PUT"); ehResult = OC_EH_OK; } else if (OC_REST_POST == entityHandlerRequest->method) { OIC_LOG (INFO, LISTENER_TAG, "Received OC_REST_POST from client"); + NS_LOG(DEBUG, "NSEntityHandlerNotificationCb - OC_REST_POST"); ehResult = OC_EH_OK; } else if (OC_REST_DELETE == entityHandlerRequest->method) { OIC_LOG (INFO, LISTENER_TAG, "Received OC_REST_DELETE from client"); + NS_LOG(DEBUG, "NSEntityHandlerNotificationCb - OC_REST_DELETE"); ehResult = OC_EH_OK; } else @@ -130,6 +135,7 @@ OCEntityHandlerResult NSEntityHandlerNotificationCb(OCEntityHandlerFlag flag, } OCPayloadDestroy(response.payload); + NS_LOG(DEBUG, "NSEntityHandlerNotificationCb - OUT"); return ehResult; } @@ -137,6 +143,7 @@ OCEntityHandlerResult NSEntityHandlerMessageCb(OCEntityHandlerFlag flag, OCEntityHandlerRequest *entityHandlerRequest, void* callback) { OIC_LOG_V (INFO, LISTENER_TAG, "Inside entity handler - flags: 0x%x", flag); + NS_LOG(DEBUG, "NSEntityHandlerMessageCb - IN"); OCEntityHandlerResult ehResult = OC_EH_OK; OCEntityHandlerResponse response = @@ -167,21 +174,25 @@ OCEntityHandlerResult NSEntityHandlerMessageCb(OCEntityHandlerFlag flag, if (OC_REST_GET == entityHandlerRequest->method) { OIC_LOG (INFO, LISTENER_TAG, "Received OC_REST_GET from client"); + NS_LOG(DEBUG, "NSEntityHandlerMessageCb - OC_REST_GET"); ehResult = OC_EH_OK; } else if (OC_REST_PUT == entityHandlerRequest->method) { OIC_LOG (INFO, LISTENER_TAG, "Received OC_REST_PUT from client"); + NS_LOG(DEBUG, "NSEntityHandlerMessageCb - OC_REST_PUT"); ehResult = OC_EH_OK; } else if (OC_REST_POST == entityHandlerRequest->method) { OIC_LOG (INFO, LISTENER_TAG, "Received OC_REST_POST from client"); + NS_LOG(DEBUG, "NSEntityHandlerMessageCb - OC_REST_POST"); ehResult = OC_EH_OK; } else if (OC_REST_DELETE == entityHandlerRequest->method) { OIC_LOG (INFO, LISTENER_TAG, "Received OC_REST_DELETE from client"); + NS_LOG(DEBUG, "NSEntityHandlerMessageCb - OC_REST_DELETE"); ehResult = OC_EH_OK; } else @@ -242,18 +253,20 @@ OCEntityHandlerResult NSEntityHandlerMessageCb(OCEntityHandlerFlag flag, if (flag & OC_OBSERVE_FLAG) { OIC_LOG(INFO, LISTENER_TAG, "Flag includes OC_OBSERVE_FLAG"); + NS_LOG(DEBUG, "NSEntityHandlerMessageCb - OC_OBSERVE_FLAG"); if (OC_OBSERVE_REGISTER == entityHandlerRequest->obsInfo.action) { OIC_LOG (INFO, LISTENER_TAG, "Received OC_OBSERVE_REGISTER from client"); - - printf("NS_ register message observerID : %d\n", entityHandlerRequest->obsInfo.obsId); + NS_LOG(DEBUG, "NSEntityHandlerMessageCb - OC_OBSERVE_REGISTER"); + NS_LOG_V(DEBUG, "NSEntityHandlerMessageCb\n" + "Register message observerID : %d\n", entityHandlerRequest->obsInfo.obsId); NSPushQueue(SUBSCRIPTION_SCHEDULER, TASK_RECV_SUBSCRIPTION, entityHandlerRequest); - } } OCPayloadDestroy(response.payload); + NS_LOG(DEBUG, "NSEntityHandlerMessageCb - OUT"); return ehResult; } @@ -261,7 +274,7 @@ OCEntityHandlerResult NSEntityHandlerSyncCb(OCEntityHandlerFlag flag, OCEntityHandlerRequest *entityHandlerRequest, void* callback) { OIC_LOG_V (INFO, LISTENER_TAG, "Inside entity handler - flags: 0x%x", flag); - + NS_LOG(DEBUG, "NSEntityHandlerSyncCb - IN"); OCEntityHandlerResult ehResult = OC_EH_OK; OCEntityHandlerResponse response = { 0, 0, OC_EH_ERROR, 0, 0, @@ -291,18 +304,21 @@ OCEntityHandlerResult NSEntityHandlerSyncCb(OCEntityHandlerFlag flag, if (OC_REST_GET == entityHandlerRequest->method) { OIC_LOG (INFO, LISTENER_TAG, "Received OC_REST_GET from client"); + NS_LOG(DEBUG, "NSEntityHandlerSyncCb - OC_REST_GET"); ehResult = OC_EH_OK; } else if (OC_REST_PUT == entityHandlerRequest->method) { OIC_LOG (INFO, LISTENER_TAG, "Received OC_REST_PUT from client"); + NS_LOG(DEBUG, "NSEntityHandlerSyncCb - OC_REST_PUT"); ehResult = OC_EH_OK; } else if (OC_REST_POST == entityHandlerRequest->method) { OIC_LOG (INFO, LISTENER_TAG, "Received OC_REST_POST from client"); - - NSPushQueue(NOTIFICATION_SCHEDULER, TASK_SEND_READ, NSBuildOICNotificationSync(entityHandlerRequest->payload)); + NS_LOG(DEBUG, "NSEntityHandlerSyncCb - OC_REST_POST"); + NSPushQueue(NOTIFICATION_SCHEDULER, TASK_SEND_READ, + NSBuildOICNotificationSync(entityHandlerRequest->payload)); ehResult = OC_EH_OK; } else if (OC_REST_DELETE == entityHandlerRequest->method) @@ -372,12 +388,15 @@ OCEntityHandlerResult NSEntityHandlerSyncCb(OCEntityHandlerFlag flag, if (OC_OBSERVE_REGISTER == entityHandlerRequest->obsInfo.action) { OIC_LOG (INFO, LISTENER_TAG, "Received OC_OBSERVE_REGISTER from client"); - printf("NS_ register sync observerID : %d\n", entityHandlerRequest->obsInfo.obsId); + NS_LOG(DEBUG, "NSEntityHandlerSyncCb - OC_OBSERVE_REGISTER"); + NS_LOG_V(DEBUG, "NSEntityHandlerSyncCb\n - " + "Register message observerID : %d\n", entityHandlerRequest->obsInfo.obsId); NSPushQueue(SUBSCRIPTION_SCHEDULER, TASK_SYNC_SUBSCRIPTION, entityHandlerRequest); } } OCPayloadDestroy(response.payload); + NS_LOG(DEBUG, "NSEntityHandlerSyncCb - OUT"); return ehResult; } @@ -390,10 +409,12 @@ void NSProviderConnectionStateListener(CATransportAdapter_t adapter, const char (void)remote_address; OIC_LOG (INFO, LISTENER_TAG, "Connection State Changed"); + NS_LOG(DEBUG, "NSProviderConnectionStateListener - IN"); if (connected) { OIC_LOG (INFO, LISTENER_TAG, "CONNECTED"); + NS_LOG(DEBUG, "CONNECTED"); // Set Connection State NSSetProviderConnectionState(CONNECTED); @@ -401,6 +422,8 @@ void NSProviderConnectionStateListener(CATransportAdapter_t adapter, const char // Start Presence NSPushQueue(DISCOVERY_SCHEDULER, TASK_START_PRESENCE, NULL); } + + NS_LOG(DEBUG, "NSProviderConnectionStateListener - OUT"); } void NSProviderAdapterStateListener(CATransportAdapter_t adapter, bool enabled) @@ -409,10 +432,12 @@ void NSProviderAdapterStateListener(CATransportAdapter_t adapter, bool enabled) (void)adapter; OIC_LOG (INFO, LISTENER_TAG, "Adapter State Changed"); + NS_LOG(DEBUG, "NSProviderAdapterStateListener - IN"); if (enabled) { OIC_LOG (INFO, LISTENER_TAG, "CONNECTED"); + NS_LOG(DEBUG, "CONNECTED"); // Set Connection State NSSetProviderConnectionState(CONNECTED); @@ -420,10 +445,14 @@ void NSProviderAdapterStateListener(CATransportAdapter_t adapter, bool enabled) // Start Presence NSPushQueue(DISCOVERY_SCHEDULER, TASK_START_PRESENCE, NULL); } + + NS_LOG(DEBUG, "NSProviderAdapterStateListener - OUT"); } NSSync * NSBuildOICNotificationSync(OCPayload * payload) { + NS_LOG(DEBUG, "NSBuildOICNotificationSync - IN"); + if(!payload) { return NULL; @@ -460,11 +489,15 @@ NSSync * NSBuildOICNotificationSync(OCPayload * payload) OIC_LOG_V(DEBUG, LISTENER_TAG, "Sync ID : %s", retSync->mMessageId); OIC_LOG_V(DEBUG, LISTENER_TAG, "Sync State : %d", (int) retSync->mState); + NS_LOG(DEBUG, "NSBuildOICNotificationSync - OUT"); + return retSync; } NSResult NSMakeTask(NSTaskType type, OCEntityHandlerRequest *request, NSTask * task) { + NS_LOG(DEBUG, "NSMakeTask - IN"); + task = (NSTask*) OICMalloc(sizeof(NSTask)); if (!task) { @@ -476,6 +509,7 @@ NSResult NSMakeTask(NSTaskType type, OCEntityHandlerRequest *request, NSTask * t task->taskData = request; task->nextTask = NULL; + NS_LOG(DEBUG, "NSMakeTask - OUT"); return NS_OK; } diff --git a/service/notification/src/provider/NSProviderNotification.c b/service/notification/src/provider/NSProviderNotification.c index fa3b6b1..aaa9899 100644 --- a/service/notification/src/provider/NSProviderNotification.c +++ b/service/notification/src/provider/NSProviderNotification.c @@ -22,13 +22,19 @@ NSResult NSInitMessageList() { + NS_LOG(DEBUG, "NSInitMessageList - IN"); + messageList = NSCacheCreate(); messageList->cacheType = NS_PROVIDER_CACHE_MESSAGE; + + NS_LOG(DEBUG, "NSInitMessageList - OUT"); return NS_OK; } NSResult NSGetMessagePayload(NSMessage *msg, OCRepPayload** msgPayload) { + NS_LOG(DEBUG, "NSGetMessagePayload - IN"); + *msgPayload = OCRepPayloadCreate(); if (!*msgPayload) @@ -42,11 +48,14 @@ NSResult NSGetMessagePayload(NSMessage *msg, OCRepPayload** msgPayload) OCRepPayloadSetPropString(*msgPayload, NS_ATTRIBUTE_TITLE, msg->mTitle); OCRepPayloadSetPropString(*msgPayload, NS_ATTRIBUTE_TEXT, msg->mContentText); + NS_LOG(DEBUG, "NSGetMessagePayload - OUT"); return NS_OK; } NSResult NSGetSyncPayload(NSSync *sync, OCRepPayload** syncPayload) { + NS_LOG(DEBUG, "NSGetSyncPayload - IN"); + *syncPayload = OCRepPayloadCreate(); if (!*syncPayload) @@ -59,92 +68,92 @@ NSResult NSGetSyncPayload(NSSync *sync, OCRepPayload** syncPayload) OCRepPayloadSetPropString(*syncPayload, NS_ATTRIBUTE_ID, sync->mMessageId); OCRepPayloadSetPropInt(*syncPayload, NS_ATTRIBUTE_STATE, sync->mState); + NS_LOG(DEBUG, "NSGetSyncPayload - OUT"); return NS_OK; } NSResult NSSendMessage(NSMessage *msg) { OIC_LOG(DEBUG, NOTIFICATION_TAG, "Send Notification Message to consumer"); - int i; - // Set Resource and get resource handle + NS_LOG(DEBUG, "NSSendMessage - IN"); + OCResourceHandle rHandle; - OCObservationId obArray[255] = - { 0, }; - int obCount = 0; + OCObservationId obArray[255] = { 0, }; + int obCount = 0, i; + if (NSPutMessageResource(msg, &rHandle) != NS_OK) { OIC_LOG(ERROR, NOTIFICATION_TAG, PCF("Fail to put notification resource")); + NS_LOG(DEBUG, "fail to Put notification resource"); return NS_ERROR; } if (consumerSubList->head == NULL) { - printf("printf - no observers (consumerSubList->head == NULL)\n"); OIC_LOG(ERROR, NOTIFICATION_TAG, PCF("no observers")); + NS_LOG(ERROR, "SubList->head is NULL, empty SubList"); return NS_ERROR; } OCRepPayload* payload; - printf("printf - no observers - 1\n"); + if (NSGetMessagePayload(msg, &payload) != NS_OK) { - printf("printf - no observers - 2\n"); OIC_LOG(ERROR, NOTIFICATION_TAG, PCF("Failed to allocate payload")); + NS_LOG(ERROR, "fail to Get message payload"); return NS_ERROR; } - printf("printf - no observers - 3\n"); NSCacheElement * it = consumerSubList->head; - printf("printf - no observers - 4\n"); + while (it) { - printf("printf - no observers - 5\n"); NSCacheSubData * subData = (NSCacheSubData *) it->data; - printf("NS_ subData->id = %s\n", subData->id); - printf("NS_ subData->messageId = %d\n", subData->messageObId); - printf("NS_ subData->obID = %d\n", subData->syncObId); - printf("NS_ subData->isWhite = %d\n", subData->isWhite); + NS_LOG_V(DEBUG, "subData->id = %s", subData->id); + NS_LOG_V(DEBUG, "subData->messageId = %d", subData->messageObId); + NS_LOG_V(DEBUG, "subData->obID = %d", subData->syncObId); + NS_LOG_V(DEBUG, "subData->isWhite = %d", subData->isWhite); - printf("printf - no observers - 6\n"); if (subData->isWhite) { - printf("printf - no observers - 7\n"); obArray[obCount++] = subData->messageObId; - printf("printf - no observers - 8\n"); } it = it->next; } - printf("printf - no observers - 9\n"); + + NS_LOG_V(DEBUG, "observer Count = %d", obCount); + for (i = 0; i < obCount; ++i) { - printf("NS_ -------------------------------------------------------message\n"); - printf("NS_ whiteList->idList[%d] = %d\n", i, obArray[i]); - printf("NS_ -------------------------------------------------------message\n"); + NS_LOG(DEBUG, "-------------------------------------------------------message\n"); + NS_LOG_V(DEBUG, "SubScription WhiteList[%d] = %d", i, obArray[i]); + NS_LOG(DEBUG, "-------------------------------------------------------message\n"); } - printf("printf - no observers - 10\n"); OCStackResult ocstackResult = OCNotifyListOfObservers(rHandle, obArray, obCount, payload, OC_LOW_QOS); - printf("NS_ message ocstackResult = %d\n", ocstackResult); + + NS_LOG_V(DEBUG, "Message ocstackResult = %d", ocstackResult); if (ocstackResult != OC_STACK_OK) { - printf("printf - no observers - 11\n"); OIC_LOG(ERROR, NOTIFICATION_TAG, "fail to send message"); + NS_LOG(ERROR, "fail to send message"); OCRepPayloadDestroy(payload); return NS_ERROR; - } - printf("printf - no observers - 12\n"); OCRepPayloadDestroy(payload); + NS_LOG(DEBUG, "NSSendMessage - OUT"); + return NS_OK; } NSResult NSSendSync(NSSync *sync) { OIC_LOG(DEBUG, NOTIFICATION_TAG, "Send Notification Sync to consumer"); + NS_LOG(DEBUG, "NSSendSync - IN"); OCObservationId obArray[255] = { 0, }; int obCount = 0; @@ -171,8 +180,6 @@ NSResult NSSendSync(NSSync *sync) } - // Send sync to subscribers - OCRepPayload* payload; if (NSGetSyncPayload(sync, &payload) != NS_OK) { @@ -180,19 +187,18 @@ NSResult NSSendSync(NSSync *sync) return NS_ERROR; } - // Notify sync to subscribers - for (i = 0; i < obCount; ++i) { - printf("NS_ -------------------------------------------------------message\n"); - printf("NS_ whiteList->idList[%d] = %d\n", i, obArray[i]); - printf("NS_ -------------------------------------------------------message\n"); + NS_LOG(DEBUG, "-------------------------------------------------------message\n"); + NS_LOG_V(DEBUG, "Sync WhiteList[%d] = %d", i, obArray[i]); + NS_LOG(DEBUG, "-------------------------------------------------------message\n"); } OCStackResult ocstackResult = OCNotifyListOfObservers(rHandle, obArray, obCount, payload, OC_LOW_QOS); - printf("NS_ sync ocstackResult = %d\n", ocstackResult); + NS_LOG_V(DEBUG, "Sync ocstackResult = %d", ocstackResult); + if (ocstackResult != OC_STACK_OK) { OIC_LOG(ERROR, NOTIFICATION_TAG, "fail to send Sync"); @@ -200,8 +206,10 @@ NSResult NSSendSync(NSSync *sync) return NS_ERROR; } + OCRepPayloadDestroy(payload); + NS_LOG(DEBUG, "NSSendSync - OUT"); return NS_OK; } @@ -210,6 +218,7 @@ void * NSNotificationSchedule(void *ptr) if (ptr == NULL) { OIC_LOG(DEBUG, NOTIFICATION_TAG, "Create NSNotifiactionSchedule"); + NS_LOG(DEBUG, "Create NSNotifiactionSchedule"); } while (NSIsRunning[NOTIFICATION_SCHEDULER]) @@ -226,20 +235,24 @@ void * NSNotificationSchedule(void *ptr) { case TASK_SEND_NOTIFICATION: { + NS_LOG(DEBUG, "CASE TASK_SEND_NOTIFICATION : "); NSMessage * nsMsg = node->taskData; NSSendMessage(nsMsg); break; } case TASK_SEND_READ: + NS_LOG(DEBUG, "CASE TASK_SEND_READ : "); NSSendSync((NSSync*) node->taskData); break; case TASK_RECV_READ: + NS_LOG(DEBUG, "CASE TASK_RECV_READ : "); NSSendSync((NSSync*) node->taskData); NSPushQueue(RESPONSE_SCHEDULER, TASK_CB_SYNC, node->taskData); break; default: OIC_LOG(ERROR, NOTIFICATION_TAG, "Unknown type message"); + NS_LOG(ERROR, "Unknow type message"); break; } diff --git a/service/notification/src/provider/NSProviderResource.c b/service/notification/src/provider/NSProviderResource.c index 7bd651a..a9a2111 100644 --- a/service/notification/src/provider/NSProviderResource.c +++ b/service/notification/src/provider/NSProviderResource.c @@ -63,9 +63,11 @@ NSSyncResource NotificationSyncResource; NSResult NSCreateResource(char *uri) { + NS_LOG(DEBUG, "NSCreateResource - IN"); if (!uri) { OIC_LOG(ERROR, RESOURCE_TAG, "Resource URI cannot be NULL"); + NS_LOG(NS_ERROR, "Resource URI cannot be NULL"); return NS_ERROR; } @@ -81,6 +83,7 @@ NSResult NSCreateResource(char *uri) NSEntityHandlerNotificationCb, NULL, OC_DISCOVERABLE) != OC_STACK_OK) { OIC_LOG(ERROR, RESOURCE_TAG, PCF("Fail to Create Notification Resource")); + NS_LOG(NS_ERROR, "Fail to Create Notification Resource"); return NS_ERROR; } } @@ -96,6 +99,7 @@ NSResult NSCreateResource(char *uri) NSMessageUri, NSEntityHandlerMessageCb, NULL, OC_OBSERVABLE) != OC_STACK_OK) { OIC_LOG(ERROR, RESOURCE_TAG, PCF("Fail to Create Notification Message Resource")); + NS_LOG(NS_ERROR, "Fail to Create Notification Message Resource"); return NS_ERROR; } } @@ -110,71 +114,84 @@ NSResult NSCreateResource(char *uri) NSEntityHandlerSyncCb, NULL, OC_OBSERVABLE) != OC_STACK_OK) { OIC_LOG(ERROR, RESOURCE_TAG, PCF("Fail to Create Notification Sync Resource")); + NS_LOG(NS_ERROR, "Fail to Create Notification Sync Resource"); return NS_ERROR; } } else { OIC_LOG(ERROR, RESOURCE_TAG, PCF("Fail to create resource with invalid URI")); + NS_LOG(DEBUG, "Fail to create resource with invalid URI"); return NS_ERROR; } + NS_LOG(DEBUG, "NSCreateResource - OUT"); return NS_OK; } NSResult NSRegisterResource() { OIC_LOG(INFO, RESOURCE_TAG, "NSRegisterResource"); + NS_LOG(DEBUG, "NSRegisterResource - IN"); if (NSCreateResource(NSSyncUri) != NS_OK) { OIC_LOG(ERROR, RESOURCE_TAG, PCF("Fail to register Sync Resource")); + NS_LOG(DEBUG, "Fail to register Sync Resource"); return NS_ERROR; } if (NSCreateResource(NSMessageUri) != NS_OK) { OIC_LOG(ERROR, RESOURCE_TAG, PCF("Fail to register Message Resource")); + NS_LOG(DEBUG, "Fail to register Message Resource"); return NS_ERROR; } if (NSCreateResource(NSUri) != NS_OK) { OIC_LOG(ERROR, RESOURCE_TAG, PCF("Fail to register Notification Resource")); + NS_LOG(DEBUG, "Fail to register Notification Resource"); return NS_ERROR; } + NS_LOG(DEBUG, "NSRegisterResource - OUT"); return NS_OK; } NSResult NSPutNotificationResource(int accepter, OCResourceHandle * handle) { + NS_LOG(DEBUG, "NSPutNotificationResource - IN"); + NotificationResource.accepter = accepter; NotificationResource.message_uri = NSMessageUri; NotificationResource.sync_uri = NSSyncUri; *handle = NotificationResource.handle; + NS_LOG(DEBUG, "NSPutNotificationResource - OUT"); return NS_OK; } NSResult NSPutMessageResource(NSMessage *msg, OCResourceHandle * handle) { OIC_LOG(INFO, RESOURCE_TAG, "Put notification message to Resource"); + NS_LOG(DEBUG, "NSPutMessageResource - IN"); if(msg != NULL) { - printf("msg is not null\n"); + NS_LOG(ERROR, "NSMessage is valid"); NotificationMessageResource.id = strdup(msg->mId); NotificationMessageResource.title = strdup(msg->mTitle); NotificationMessageResource.body = strdup(msg->mContentText); } else { - printf("msg is null\n"); + NS_LOG(ERROR, "NSMessage is NULL"); } *handle = NotificationMessageResource.handle; + NS_LOG(DEBUG, "NSPutMessageResource - OUT"); return NS_OK; } @@ -182,12 +199,13 @@ NSResult NSPutMessageResource(NSMessage *msg, OCResourceHandle * handle) NSResult NSPutSyncResource(NSSync *sync, OCResourceHandle * handle) { OIC_LOG(INFO, RESOURCE_TAG, "Put notification sync to Resource"); + NS_LOG(DEBUG, "NSPutSyncResource - IN"); - //should be implementation (void) sync; *handle = NotificationSyncResource.handle; + NS_LOG(DEBUG, "NSPutSyncResource - OUT"); return NS_OK; } diff --git a/service/notification/src/provider/NSProviderScheduler.c b/service/notification/src/provider/NSProviderScheduler.c index af3a90c..00b5968 100755 --- a/service/notification/src/provider/NSProviderScheduler.c +++ b/service/notification/src/provider/NSProviderScheduler.c @@ -39,9 +39,9 @@ void * NSNotificationSchedule(void *ptr); bool NSInitScheduler() { OIC_LOG(INFO, SCHEDULER_TAG, "NSInitScheduler()"); + NS_LOG(DEBUG, "NSInitScheduler - IN"); int i = 0; - // NsQsStopScheduler(ALL_SCHEDULER); for (i = 0; i < THREAD_COUNT; i++) { @@ -50,6 +50,7 @@ bool NSInitScheduler() sem_init(&(NSSemaphore[i]), 0, 0); } + NS_LOG(DEBUG, "NSInitScheduler - OUT"); return true; } @@ -65,24 +66,28 @@ bool NSStartScheduler() { case RESPONSE_SCHEDULER: { + NS_LOG(DEBUG, "CASE RESPONSE_SCHEDULER :"); pthread_create(&NSThread[i], NULL, NSResponseSchedule, NULL); } break; case DISCOVERY_SCHEDULER: { + NS_LOG(DEBUG, "CASE DISCOVERY_SCHEDULER :"); pthread_create(&NSThread[i], NULL, NSDiscoverySchedule, NULL); } break; case SUBSCRIPTION_SCHEDULER: { + NS_LOG(DEBUG, "CASE SUBSCRIPTION_SCHEDULER :"); pthread_create(&NSThread[i], NULL, NSSubScriptionSchedule, NULL); } break; case NOTIFICATION_SCHEDULER: { + NS_LOG(DEBUG, "CASE NOTIFICATION_SCHEDULER :"); pthread_create(&NSThread[i], NULL, NSNotificationSchedule, NULL); } break; @@ -103,6 +108,7 @@ bool NSStartScheduler() bool NSStopScheduler() { + NS_LOG(DEBUG, "NSStopScheduler - IN"); int i = 0; for (i = THREAD_COUNT - 1; i >= 0; --i) @@ -127,16 +133,21 @@ bool NSStopScheduler() pthread_mutex_unlock(&NSMutex[i]); } + NS_LOG(DEBUG, "NSStopScheduler - OUT"); + return true; } void NSPushQueue(NSSchedulerType schedulerType, NSTaskType taskType, void* data) { pthread_mutex_lock(&NSMutex[schedulerType]); - // mutext Lock + + NS_LOG(DEBUG, "NSPushQueue - IN"); + NS_LOG_V(DEBUG, "NSSchedulerType = %d", schedulerType); + NS_LOG_V(DEBUG, "NSTaskType = %d", taskType); + if (NSHeadMsg[schedulerType] == NULL) { - printf("first schedule"); NSHeadMsg[schedulerType] = (NSTask*) malloc(sizeof(NSTask)); memset(NSHeadMsg[schedulerType], 0, sizeof(NSTask)); NSHeadMsg[schedulerType]->taskType = taskType; @@ -146,7 +157,6 @@ void NSPushQueue(NSSchedulerType schedulerType, NSTaskType taskType, void* data) } else { - printf("after first schedule"); NSTask* newNode = (NSTask*) malloc(sizeof(NSTask)); memset(newNode, 0, sizeof(NSTask)); newNode->taskType = taskType; @@ -158,8 +168,7 @@ void NSPushQueue(NSSchedulerType schedulerType, NSTaskType taskType, void* data) } sem_post(&(NSSemaphore[schedulerType])); + NS_LOG(DEBUG, "NSPushQueue - OUT"); pthread_mutex_unlock(&NSMutex[schedulerType]); - - // mutext UnLock } diff --git a/service/notification/src/provider/NSProviderSubscription.c b/service/notification/src/provider/NSProviderSubscription.c index 4038c85..084f472 100644 --- a/service/notification/src/provider/NSProviderSubscription.c +++ b/service/notification/src/provider/NSProviderSubscription.c @@ -22,24 +22,33 @@ NSResult NSInitSubscriptionList() { + NS_LOG(DEBUG, "NSInitSubscriptionList - IN"); + consumerSubList = NSCacheCreate(); consumerSubList->cacheType = NS_PROVIDER_CACHE_SUBSCRIBER; + + NS_LOG(DEBUG, "NSInitSubscriptionList - OUT"); return NS_OK; } NSResult NSSetSubscriptionAcceptPolicy(NSAccessPolicy policy) { + NS_LOG(DEBUG, "NSSetSubscriptionAcceptPolicy - IN"); + if (policy == NS_ACCEPTER_PROVIDER) { OIC_LOG(INFO, SUBSCRIPTION_TAG, "Place Provider as a subscription accepter"); + NS_LOG(DEBUG, "Place Provider as a subscription accepter"); } else if (policy == NS_ACCEPTER_CONSUMER) { OIC_LOG(INFO, SUBSCRIPTION_TAG, "Place Consumer as a subscription accepter"); + NS_LOG(DEBUG, "Place Consumer as a subscription accepter"); } NSSubscriptionAccepter = policy; + NS_LOG(DEBUG, "NSSetSubscriptionAcceptPolicy - OUT"); return NS_OK; } @@ -51,6 +60,7 @@ int NSGetSubscriptionAccepter() NSResult NSSendAccessPolicyResponse(OCEntityHandlerRequest *entityHandlerRequest) { OIC_LOG(DEBUG, NOTIFICATION_TAG, "Send Notification Policy to consumer"); + NS_LOG(DEBUG, "NSSendAccessPolicyResponse - IN"); // put notification resource OCResourceHandle notificationResourceHandle; @@ -58,6 +68,7 @@ NSResult NSSendAccessPolicyResponse(OCEntityHandlerRequest *entityHandlerRequest != NS_OK) { OIC_LOG(ERROR, SUBSCRIPTION_TAG, PCF("Failed to put notification resource")); + NS_LOG(ERROR, "Fail to put notification resource"); return NS_ERROR; } @@ -69,10 +80,10 @@ NSResult NSSendAccessPolicyResponse(OCEntityHandlerRequest *entityHandlerRequest memset(response.resourceUri, 0, sizeof response.resourceUri); OCRepPayload* payload = OCRepPayloadCreate(); - //response.payload = OCRepPayloadCreate(); if (!payload) { OIC_LOG(ERROR, SUBSCRIPTION_TAG, PCF("Failed to allocate Payload")); + NS_LOG(ERROR, "payload is NULL"); return NS_ERROR; } @@ -91,10 +102,12 @@ NSResult NSSendAccessPolicyResponse(OCEntityHandlerRequest *entityHandlerRequest if (OCDoResponse(&response) != OC_STACK_OK) { OIC_LOG(ERROR, SUBSCRIPTION_TAG, PCF("Fail to send response")); + NS_LOG(ERROR, "Fail to AccessPolicy send response"); return NS_ERROR; } OCRepPayloadDestroy(payload); + NS_LOG(DEBUG, "NSSendAccessPolicyResponse - OUT"); return NS_OK; } @@ -102,13 +115,11 @@ void NSHandleSubscription(OCEntityHandlerRequest *entityHandlerRequest, NSResour { OIC_LOG(INFO, SUBSCRIPTION_TAG, "Start to subscription process"); - - printf("state = 0 \n"); - - // write consumer info to cache + NS_LOG(DEBUG, "NSHandleSubscription - IN"); if (resourceType == NS_RESOURCE_MESSAGE) { + NS_LOG(DEBUG, "resourceType == NS_RESOURCE_MESSAGE"); NSCacheElement * element = (NSCacheElement *) OICMalloc(sizeof(NSCacheElement)); NSCacheSubData * subData = (NSCacheSubData *) OICMalloc(sizeof(NSCacheSubData)); @@ -120,34 +131,29 @@ void NSHandleSubscription(OCEntityHandlerRequest *entityHandlerRequest, NSResour element->data = (void*) subData; element->next = NULL; - printf("NS_ IP = %s in message ob\n", entityHandlerRequest->devAddr.addr); - printf("NS_ IP2 = %s in message ob\n", subData->id); - printf("NS_ message ob Id = %d\n", subData->messageObId); - if (NSCacheWrite(consumerSubList, element) != NS_OK) { - printf("Cache Write Error\n"); + NS_LOG(DEBUG, "fail to write cache"); } if (NSGetSubscriptionAccepter() == NS_ACCEPTER_PROVIDER) { - // OCDevAddr --> NSConsumer - printf("before NSGetSubscriptionAccepter() == NS_ACCEPTER_PROVIDER)\n"); + NS_LOG(DEBUG, "NSGetSubscriptionAccepter == NS_ACCEPTER_PROVIDER"); NSAskAcceptanceToUser(entityHandlerRequest); - printf("After NSGetSubscriptionAccepter() == NS_ACCEPTER_PROVIDER)\n"); } else if (NSGetSubscriptionAccepter() == NS_ACCEPTER_CONSUMER) { - printf("state = 0 - 3\n"); + NS_LOG(DEBUG, "NSGetSubscriptionAccepter == NS_ACCEPTER_CONSUMER"); NSSendSubscriptionResponse(entityHandlerRequest, true); } } else if (resourceType == NS_RESOURCE_SYNC) { + NS_LOG(DEBUG, "resourceType == NS_RESOURCE_SYNC"); NSCacheElement * element = (NSCacheElement *) OICMalloc(sizeof(NSCacheElement)); NSCacheSubData * subData = (NSCacheSubData *) OICMalloc(sizeof(NSCacheSubData)); - printf("NS_ entityHandlerRequest->devAddr.addr = %s\n", entityHandlerRequest->devAddr.addr); + subData->id = OICStrdup(entityHandlerRequest->devAddr.addr); subData->isWhite = false; subData->syncObId = entityHandlerRequest->obsInfo.obsId; @@ -156,18 +162,22 @@ void NSHandleSubscription(OCEntityHandlerRequest *entityHandlerRequest, NSResour element->data = (void*) subData; element->next = NULL; - printf("NS_ sync ob Id = %d\n", subData->syncObId); + NS_LOG_V(DEBUG, "SubList IP[ID] = [%s]", subData->id); + NS_LOG_V(DEBUG, "SubList observation ID = [%d]", subData->syncObId); if (NSCacheWrite(consumerSubList, element) != NS_OK) { - printf("Cache Write Error\n"); + NS_LOG(ERROR, "Fail to write cache"); } } + + NS_LOG(DEBUG, "NSHandleSubscription - OUT"); } void NSHandleUnsubscription(OCEntityHandlerRequest *entityHandlerRequest) { OIC_LOG(INFO, SUBSCRIPTION_TAG, "Start to unsubscription process"); + NS_LOG(DEBUG, "NSHandleUnsubscription - IN"); NSCacheElement * element = (NSCacheElement *) OICMalloc(sizeof(NSCacheElement)); NSCacheSubData * subData = (NSCacheSubData *) OICMalloc(sizeof(NSCacheSubData)); @@ -178,27 +188,37 @@ void NSHandleUnsubscription(OCEntityHandlerRequest *entityHandlerRequest) element->data = (void*) subData; element->next = NULL; + NS_LOG_V(DEBUG, "SubList IP[ID] = [%s]", subData->id); + NS_LOG_V(DEBUG, "SubList observation ID = [%d]", subData->syncObId); + if (NSCacheWrite(consumerSubList, element) != NS_OK) { OIC_LOG(ERROR, SUBSCRIPTION_TAG, "fail to write consumer white list"); + NS_LOG(ERROR, "fail to write consumer white list"); } + + NS_LOG(DEBUG, "NSHandleUnsubscription - IN"); } void NSAskAcceptanceToUser(OCEntityHandlerRequest *entityHandlerRequest) { OIC_LOG(DEBUG, SUBSCRIPTION_TAG, "Ask for user to Allow or Deny"); + NS_LOG(DEBUG, "NSAskAcceptanceToUser - IN"); NSPushQueue(RESPONSE_SCHEDULER, TASK_CB_SUBSCRIPTION, entityHandlerRequest); - // one queue is required for response callback to ask subscription allowance + + NS_LOG(DEBUG, "NSAskAcceptanceToUser - OUT"); } NSResult NSSendResponse(const char * id, bool accepted) { + NS_LOG(DEBUG, "NSSendResponse - IN"); OCRepPayload* payload = OCRepPayloadCreate(); if (!payload) { OIC_LOG(ERROR, SUBSCRIPTION_TAG, PCF("Failed to allocate Payload")); + NS_LOG(ERROR, "fail to create playload"); return NS_ERROR; } @@ -206,6 +226,7 @@ NSResult NSSendResponse(const char * id, bool accepted) if (NSPutMessageResource(NULL, &rHandle) != NS_OK) { OIC_LOG(ERROR, NOTIFICATION_TAG, PCF("Fail to put notification resource")); + NS_LOG(ERROR, "Fail to put notification resource"); return NS_ERROR; } @@ -217,7 +238,7 @@ NSResult NSSendResponse(const char * id, bool accepted) if(element == NULL) { - printf("NS_ NSSendResponse - element is NULL\n"); + NS_LOG(ERROR, "element is NULL"); return NS_ERROR; } NSCacheSubData * subData = (NSCacheSubData*) element->data; @@ -226,18 +247,21 @@ NSResult NSSendResponse(const char * id, bool accepted) != OC_STACK_OK) { OIC_LOG(ERROR, SUBSCRIPTION_TAG, "fail to send Acceptance"); + NS_LOG(ERROR, "fail to send Acceptance"); OCRepPayloadDestroy(payload); return NS_ERROR; } OCRepPayloadDestroy(payload); + NS_LOG(DEBUG, "NSSendResponse - OUT"); return NS_OK; } NSResult NSSendSubscriptionResponse(OCEntityHandlerRequest *entityHandlerRequest, bool accepted) { OIC_LOG(INFO, SUBSCRIPTION_TAG, "Send ACCEPT message to consumer"); + NS_LOG(DEBUG, "NSSendSubscriptionResponse - IN"); if (!entityHandlerRequest) { @@ -245,11 +269,9 @@ NSResult NSSendSubscriptionResponse(OCEntityHandlerRequest *entityHandlerRequest return OC_EH_ERROR; } - // write consumer info to cache - - printf("accepted 1 \n"); if (accepted) { + NS_LOG(DEBUG, "accepted is true"); NSCacheElement * element = (NSCacheElement *) OICMalloc(sizeof(NSCacheElement)); NSCacheSubData * subData = (NSCacheSubData *) OICMalloc(sizeof(NSCacheSubData)); @@ -263,13 +285,14 @@ NSResult NSSendSubscriptionResponse(OCEntityHandlerRequest *entityHandlerRequest if (NSCacheWrite(consumerSubList, element) != NS_OK) { OIC_LOG(ERROR, SUBSCRIPTION_TAG, "fail to write consumer white list"); + NS_LOG(ERROR, "fail to write consumer white list"); } } NSSendResponse(entityHandlerRequest->devAddr.addr, accepted); + NS_LOG(DEBUG, "NSSendSubscriptionResponse - OUT"); return NS_OK; - } void * NSSubScriptionSchedule(void *ptr) @@ -278,6 +301,7 @@ void * NSSubScriptionSchedule(void *ptr) if (ptr == NULL) { OIC_LOG(INFO, SUBSCRIPTION_TAG, "Create NSSubscriptionSchedule"); + NS_LOG(DEBUG, "Create NSSubScriptionSchedule"); } while (NSIsRunning[SUBSCRIPTION_SCHEDULER]) @@ -292,27 +316,26 @@ void * NSSubScriptionSchedule(void *ptr) switch (node->taskType) { - case TASK_SEND_POLICY: + NS_LOG(DEBUG, "CASE TASK_SEND_POLICY : "); NSSendAccessPolicyResponse((OCEntityHandlerRequest*) node->taskData); break; case TASK_RECV_SUBSCRIPTION: - printf("before TASK_RECV_SUBSCRIPTION:\n"); + NS_LOG(DEBUG, "CASE TASK_RECV_SUBSCRIPTION : "); NSHandleSubscription((OCEntityHandlerRequest*) node->taskData, NS_RESOURCE_MESSAGE); - printf("after TASK_RECV_SUBSCRIPTION:\n"); break; case TASK_RECV_UNSUBSCRIPTION: - + NS_LOG(DEBUG, "CASE TASK_RECV_UNSUBSCRIPTION : "); NSHandleUnsubscription((OCEntityHandlerRequest*) node->taskData); break; case TASK_SEND_ALLOW: { + NS_LOG(DEBUG, "CASE TASK_SEND_ALLOW : "); NSConsumer * consumer = (NSConsumer *) node->taskData; - int * pObId = (int *) consumer->mUserData; NSCacheSubData * subData = (NSCacheSubData *) OICMalloc(sizeof(NSCacheSubData)); subData->id = OICStrdup(consumer->mId); @@ -321,15 +344,13 @@ void * NSSubScriptionSchedule(void *ptr) subData->syncObId = 0; NSCacheUpdateSubScriptionState(consumerSubList, subData); - - printf("observer ID = %d\n", *pObId); - NSSendResponse(consumer->mId, true); break; } case TASK_SEND_DENY: { + NS_LOG(DEBUG, "CASE TASK_SEND_DENY : "); NSConsumer * consumer = (NSConsumer *) node->taskData; int * pObId = (int *) consumer->mUserData; @@ -345,6 +366,7 @@ void * NSSubScriptionSchedule(void *ptr) break; } case TASK_SYNC_SUBSCRIPTION: + NS_LOG(DEBUG, "CASE TASK_SYNC_SUBSCRIPTION : "); NSHandleSubscription((OCEntityHandlerRequest*) node->taskData, NS_RESOURCE_SYNC); break; diff --git a/service/notification/src/provider/NSProviderSystem.c b/service/notification/src/provider/NSProviderSystem.c index 797caaf..0746409 100644 --- a/service/notification/src/provider/NSProviderSystem.c +++ b/service/notification/src/provider/NSProviderSystem.c @@ -24,6 +24,7 @@ static NSConnectionState NSProviderConnectionState; void NSSetProviderConnectionState(NSConnectionState state) { OIC_LOG(INFO, SUBSCRIPTION_TAG, "Change Connection State"); + NS_LOG(DEBUG, "NSSetProviderConnectionState"); NSProviderConnectionState = state; } @@ -31,6 +32,7 @@ void NSSetProviderConnectionState(NSConnectionState state) NSConnectionState NSGetProviderConnectionState() { OIC_LOG(INFO, SUBSCRIPTION_TAG, "Change Connection State"); + //NS_LOG(DEBUG, "NSGetProviderConnectionState"); return NSProviderConnectionState; } diff --git a/service/notification/src/provider/NSProviderSystem.h b/service/notification/src/provider/NSProviderSystem.h index c587372..3fceb11 100644 --- a/service/notification/src/provider/NSProviderSystem.h +++ b/service/notification/src/provider/NSProviderSystem.h @@ -21,6 +21,7 @@ #ifndef _NS_PROVIDER_SYSTEM__H_ #define _NS_PROVIDER_SYSTEM__H_ +#include #include "logger.h" #include "NSCommon.h" #include "NSConstants.h" diff --git a/service/notification/src/provider/cache/linux/NSProviderMemoryCache.c b/service/notification/src/provider/cache/linux/NSProviderMemoryCache.c index 260638f..d52eee1 100755 --- a/service/notification/src/provider/cache/linux/NSProviderMemoryCache.c +++ b/service/notification/src/provider/cache/linux/NSProviderMemoryCache.c @@ -33,26 +33,31 @@ NSCacheList * NSCacheCreate() pthread_mutex_unlock(&NSCacheMutex); + NS_LOG(DEBUG, "NSCacheCreate"); + return newList; } NSCacheElement * NSCacheRead(NSCacheList * list, const char * findId) { pthread_mutex_lock(&NSCacheMutex); + + NS_LOG(DEBUG, "NSCacheRead - IN"); + NSCacheElement * iter = list->head; NSCacheElement * next = NULL; NSCacheType type = list->cacheType; - printf("NS_ findId = %s\n", findId); + + NS_LOG_V(DEBUG, "Find ID - %s", findId); while (iter) { next = iter->next; - printf("NS_ findId2 = %s\n", findId); - if (NSProviderCompareIdCacheData(type, iter->data, findId)) { + NS_LOG(DEBUG, "Found in Cache"); pthread_mutex_unlock(&NSCacheMutex); return iter; } @@ -60,56 +65,64 @@ NSCacheElement * NSCacheRead(NSCacheList * list, const char * findId) iter = next; } + NS_LOG(DEBUG, "Not found in Cache"); + NS_LOG(DEBUG, "NSCacheRead - OUT"); pthread_mutex_unlock(&NSCacheMutex); return NULL; } -NSResult NSCacheUpdateSubScriptionState(NSCacheList * list, NSCacheSubData * subData) +NSResult NSCacheUpdateSubScriptionState(NSCacheList * list, NSCacheSubData * updateData) { pthread_mutex_lock(&NSCacheMutex); - printf("NS_ NSCacheUpdateSubScriptionState\n"); + NS_LOG(DEBUG, "NSCacheUpdateSubScriptionState - IN"); - if (subData == NULL) + if (updateData == NULL) { - printf("NS_ NSCacheWrite - newObj is NULL\n"); + NS_LOG(DEBUG, "updateData is NULL"); pthread_mutex_unlock(&NSCacheMutex); return NS_ERROR; } - printf("NS_ findId0 - 0 = %s\n", subData->id); pthread_mutex_unlock(&NSCacheMutex); - NSCacheElement * it = NSCacheRead(list, subData->id); + NSCacheElement * it = NSCacheRead(list, updateData->id); pthread_mutex_lock(&NSCacheMutex); - printf("NS_ findId0 -1 = %s\n", subData->id); + if (it) { - printf("NS_ findId1 = %s\n", subData->id); NSCacheSubData * itData = (NSCacheSubData *) it->data; - printf("NS_ findId2 = %s\n", subData->id); - if (strcmp(itData->id, subData->id) == 0) + if (strcmp(itData->id, updateData->id) == 0) { - printf("NS_ findId3_subdata_id = %s\n", subData->id); - printf("NS_ findId3_subdata_messageobId = %d\n", subData->messageObId); - printf("NS_ findId3_subdata_syncobId = %d\n", subData->syncObId); - printf("NS_ findId3_subdata_isWhite = %d\n", subData->isWhite); + NS_LOG(DEBUG, "Update Data - IN"); + + NS_LOG_V(DEBUG, "currData_ID = %s", itData->id); + NS_LOG_V(DEBUG, "currData_MsgObID = %d", itData->messageObId); + NS_LOG_V(DEBUG, "currData_SyncObID = %d", itData->syncObId); + NS_LOG_V(DEBUG, "currData_IsWhite = %d", itData->isWhite); - printf("NS_ findId3_itdata_id = %s\n", itData->id); - printf("NS_ findId3_itdata_messageobId = %d\n", itData->messageObId); - printf("NS_ findId3_itdata_isWhite = %d\n", itData->isWhite); + NS_LOG(DEBUG,""); - itData->isWhite = subData->isWhite; + NS_LOG_V(DEBUG, "updateData_ID = %s", updateData->id); + NS_LOG_V(DEBUG, "updateData_MsgObID = %d", updateData->messageObId); + NS_LOG_V(DEBUG, "updateData_SyncObID = %d", updateData->syncObId); + NS_LOG_V(DEBUG, "updateData_IsWhite = %d", updateData->isWhite); - printf("_NS : PROVIDER_CACHE_SUBSCRIBER UPDATE\n"); + itData->isWhite = updateData->isWhite; + NS_LOG(DEBUG, "Update Data - OUT"); pthread_mutex_unlock(&NSCacheMutex); return NS_OK; - } } + else + { + NS_LOG(DEBUG, "Not Found Data"); + } + + NS_LOG(DEBUG, "NSCacheUpdateSubScriptionState - OUT"); pthread_mutex_unlock(&NSCacheMutex); - return NS_OK; + return NS_ERROR; } NSResult NSCacheWrite(NSCacheList * list, NSCacheElement * newObj) @@ -118,39 +131,45 @@ NSResult NSCacheWrite(NSCacheList * list, NSCacheElement * newObj) NSCacheType type = list->cacheType; - printf("NS_ NSCacheWrite\n"); + NS_LOG(DEBUG, "NSCacheWrite - IN"); if (newObj == NULL) { - printf("NS_ NSCacheWrite - newObj is NULL\n"); + NS_LOG(DEBUG, "newObj is NULL - IN"); pthread_mutex_unlock(&NSCacheMutex); return NS_ERROR; } if (type == NS_PROVIDER_CACHE_SUBSCRIBER) { + NS_LOG(DEBUG, "Type is SUBSCRIBER"); + NSCacheSubData * subData = (NSCacheSubData *) newObj->data; - printf("NS_ findId0 - 0 = %s\n", subData->id); pthread_mutex_unlock(&NSCacheMutex); NSCacheElement * it = NSCacheRead(list, subData->id); pthread_mutex_lock(&NSCacheMutex); - printf("NS_ findId0 -1 = %s\n", subData->id); + if (it) { - printf("NS_ findId1 = %s\n", subData->id); NSCacheSubData * itData = (NSCacheSubData *) it->data; - printf("NS_ findId2 = %s\n", subData->id); + if (strcmp(itData->id, subData->id) == 0) { - printf("NS_ findId3_subdata_id = %s\n", subData->id); - printf("NS_ findId3_subdata_messageobId = %d\n", subData->messageObId); - printf("NS_ findId3_subdata_syncobId = %d\n", subData->syncObId); - printf("NS_ findId3_subdata_isWhite = %d\n", subData->isWhite); - - printf("NS_ findId3_itdata_id = %s\n", itData->id); - printf("NS_ findId3_itdata_messageobId = %d\n", itData->messageObId); - printf("NS_ findId3_itdata_isWhite = %d\n", itData->isWhite); + NS_LOG(DEBUG, "Update Data - IN"); + + NS_LOG_V(DEBUG, "currData_ID = %s", itData->id); + NS_LOG_V(DEBUG, "currData_MsgObID = %d", itData->messageObId); + NS_LOG_V(DEBUG, "currData_SyncObID = %d", itData->syncObId); + NS_LOG_V(DEBUG, "currData_IsWhite = %d", itData->isWhite); + + NS_LOG(DEBUG,""); + + NS_LOG_V(DEBUG, "subData_ID = %s", subData->id); + NS_LOG_V(DEBUG, "subData_MsgObID = %d", subData->messageObId); + NS_LOG_V(DEBUG, "subData_SyncObID = %d", subData->syncObId); + NS_LOG_V(DEBUG, "subData_IsWhite = %d", subData->isWhite); + if (itData->messageObId == 0) { itData->messageObId = subData->messageObId; @@ -161,19 +180,18 @@ NSResult NSCacheWrite(NSCacheList * list, NSCacheElement * newObj) itData->syncObId = subData->syncObId; } - //itData->isWhite = subData->isWhite; - - printf("_NS : PROVIDER_CACHE_SUBSCRIBER UPDATE\n"); + NS_LOG(DEBUG, "Update Data - OUT"); pthread_mutex_unlock(&NSCacheMutex); return NS_OK; - } } } else if (type == NS_PROVIDER_CACHE_MESSAGE) { + NS_LOG(DEBUG, "Type is MESSAGE"); + NSCacheMsgData * msgData = (NSCacheMsgData *) newObj->data; NSCacheElement * it = NSCacheRead(list, msgData->id); @@ -185,7 +203,7 @@ NSResult NSCacheWrite(NSCacheList * list, NSCacheElement * newObj) { itData->messageType = msgData->messageType; - printf("_NS : PROVIDER_CACHE_MESSAGE UPDATE\n"); + NS_LOG(DEBUG, "Updated messageType"); pthread_mutex_unlock(&NSCacheMutex); return NS_OK; @@ -193,17 +211,16 @@ NSResult NSCacheWrite(NSCacheList * list, NSCacheElement * newObj) } } - printf("NS_ berfore list->head == NULL\n"); if (list->head == NULL) { + NS_LOG(DEBUG, "list->head is NULL, Insert First Data"); list->head = list->tail = newObj; - printf("NS_ list->head == NULL\n"); pthread_mutex_unlock(&NSCacheMutex); return NS_OK; } list->tail = list->tail->next = newObj; - printf("NS_ list->head == not NULL\n"); + NS_LOG(DEBUG, "list->head is not NULL"); pthread_mutex_unlock(&NSCacheMutex); return NS_OK; } @@ -278,6 +295,8 @@ NSResult NSCacheDestroy(NSCacheList * list) bool NSProviderCompareIdCacheData(NSCacheType type, void * data, const char * id) { + NS_LOG(DEBUG, "NSProviderCompareIdCacheData - IN"); + if (data == NULL) { return false; @@ -287,13 +306,17 @@ bool NSProviderCompareIdCacheData(NSCacheType type, void * data, const char * id { NSCacheSubData * subData = (NSCacheSubData *) data; - printf("NS_ subdata->id = %s\n", subData->id); - printf("NS_ id = %s\n", id); + + NS_LOG_V(DEBUG, "Data(subData) = [%s]", subData->id); + NS_LOG_V(DEBUG, "Data(compData) = [%s]", id); if (strcmp(subData->id, id) == 0) { + NS_LOG(DEBUG, "SubData is Same"); return true; } + + NS_LOG(DEBUG, "Message Data is Not Same"); return false; } @@ -303,12 +326,16 @@ bool NSProviderCompareIdCacheData(NSCacheType type, void * data, const char * id if (strcmp(msgData->id, id) == 0) { + NS_LOG(DEBUG, "Message Data is Same"); return true; } + NS_LOG(DEBUG, "Message Data is Not Same"); return false; } + NS_LOG(DEBUG, "NSProviderCompareIdCacheData - OUT"); + return false; } -- 2.7.4