Modify logic for NSProviderGetConsumerTopicsCacheData Function.

This Function is direct used The User Interface function.
Changed to use a cache memory function.

Change-Id: I567e644a3890f78bb25495b2ab55d46be9f7912f
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10653
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/notification/src/provider/NSProviderInterface.c b/service/notification/src/provider/NSProviderInterface.c
index cec5178..cd335d5 100644 (file)
--- a/service/notification/src/provider/NSProviderInterface.c
+++ b/service/notification/src/provider/NSProviderInterface.c
@@ -252,7 +252,8 @@ NSTopicLL * NSProviderGetConsumerTopics(char *consumerId)
         return NS_FAIL;\r
     }\r
 \r
-    NSTopicLL * topics = NSProviderGetConsumerTopicsCacheData(consumerTopicList, consumerId);\r
+    NSTopicLL * topics = NSProviderGetConsumerTopicsCacheData(registeredTopicList,\r
+            consumerTopicList, consumerId);\r
 \r
     pthread_mutex_unlock(&nsInitMutex);\r
     return topics;\r

diff --git a/service/notification/src/provider/NSProviderMemoryCache.c b/service/notification/src/provider/NSProviderMemoryCache.c
index a28aca8..1f79fd5 100644 (file)
--- a/service/notification/src/provider/NSProviderMemoryCache.c
+++ b/service/notification/src/provider/NSProviderMemoryCache.c
@@ -347,9 +347,9 @@ bool NSProviderCompareIdCacheData(NSCacheType type, void * data, const char * id
 \r
 NSResult NSProviderDeleteCacheData(NSCacheType type, void * data)\r
 {\r
-    if (data == NULL)\r
+    if (!data)\r
     {\r
-        return NS_OK;\r
+        return NS_ERROR;\r
     }\r
 \r
     if (type == NS_PROVIDER_CACHE_SUBSCRIBER)\r
@@ -358,7 +358,6 @@ NSResult NSProviderDeleteCacheData(NSCacheType type, void * data)
 \r
         (subData->id)[0] = '\0';\r
         OICFree(subData);\r
-\r
         return NS_OK;\r
     }\r
     else if(type == NS_PROVIDER_CACHE_REGISTER_TOPIC)\r
@@ -369,9 +368,6 @@ NSResult NSProviderDeleteCacheData(NSCacheType type, void * data)
                 (int)topicData->state);\r
 \r
         OICFree(topicData->topicName);\r
-\r
-        NS_LOG_V(DEBUG, "topicData->topicName = %s, topicData->state = %d", "aaa",\r
-                (int)3);\r
     }\r
     else if(type == NS_PROVIDER_CACHE_CONSUMER_TOPIC_NAME ||\r
             type == NS_PROVIDER_CACHE_CONSUMER_TOPIC_CID)\r
@@ -560,12 +556,13 @@ NSTopicLL * NSProviderGetTopicsCacheData(NSCacheList * regTopicList)
     return topics;\r
 }\r
 \r
-NSTopicLL * NSProviderGetConsumerTopicsCacheData(NSCacheList * conTopicList, char *consumerId)\r
+NSTopicLL * NSProviderGetConsumerTopicsCacheData(NSCacheList * regTopicList,\r
+        NSCacheList * conTopicList, char *consumerId)\r
 {\r
-    NS_LOG(DEBUG, "NSProviderGetConsumerTopics - IN");\r
+    NS_LOG(DEBUG, "NSProviderGetConsumerTopicsCacheData - IN");\r
 \r
     pthread_mutex_lock(&NSCacheMutex);\r
-    NSTopicLL * topics = NSProviderGetTopics();\r
+    NSTopicLL * topics = NSProviderGetTopicsCacheData(regTopicList);\r
 \r
     if(!topics)\r
     {\r
@@ -580,6 +577,9 @@ NSTopicLL * NSProviderGetConsumerTopicsCacheData(NSCacheList * conTopicList, cha
     {\r
         NSCacheTopicSubData * curr = (NSCacheTopicSubData *)iter->data;\r
 \r
+        NS_LOG_V(DEBUG, "curr->id = %s", curr->id);\r
+        NS_LOG_V(DEBUG, "curr->topicName = %s", curr->topicName);\r
+\r
         if(curr && strcmp(curr->id, consumerId) == 0)\r
         {\r
             NSTopicLL * topicIter = topics;\r

diff --git a/service/notification/src/provider/NSProviderMemoryCache.h b/service/notification/src/provider/NSProviderMemoryCache.h
index 702c63a..830d50f 100644 (file)
--- a/service/notification/src/provider/NSProviderMemoryCache.h
+++ b/service/notification/src/provider/NSProviderMemoryCache.h
@@ -44,7 +44,8 @@ NSResult NSProviderDeleteSubDataFromObId(NSCacheList * list, OCObservationId id)
 \r
 NSTopicLL * NSProviderGetTopicsCacheData(NSCacheList * regTopicList);\r
 \r
-NSTopicLL * NSProviderGetConsumerTopicsCacheData(NSCacheList * conTopicList, char *consumerId);\r
+NSTopicLL * NSProviderGetConsumerTopicsCacheData(NSCacheList * regTopicList,\r
+        NSCacheList * conTopicList, char *consumerId);\r
 \r
 size_t NSProviderGetListSize(NSCacheElement * firstElement);\r
 \r

diff --git a/service/notification/src/provider/NSProviderTopic.c b/service/notification/src/provider/NSProviderTopic.c
index 947a15f..9ffca69 100644 (file)
--- a/service/notification/src/provider/NSProviderTopic.c
+++ b/service/notification/src/provider/NSProviderTopic.c
@@ -207,7 +207,7 @@ NSResult NSSendTopicList(OCEntityHandlerRequest * entityHandlerRequest)
     else\r
     {\r
         NS_LOG(DEBUG, "Send subscribed topic list to consumer");\r
-        topics = NSProviderGetConsumerTopicsCacheData(consumerTopicList, id);\r
+        topics = NSProviderGetConsumerTopicsCacheData(registeredTopicList, consumerTopicList, id);\r
         currList = consumerTopicList->head;\r
     }\r
 \r