Add list for registered topic.

We manage the two lists on the topic.

Change-Id: I1aeed85d0d04fabb9e0e896e0988f96c0c73ecff
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10229
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

diff --git a/service/notification/src/common/NSConstants.h b/service/notification/src/common/NSConstants.h
index 226a124..88505c1 100644 (file)
--- a/service/notification/src/common/NSConstants.h
+++ b/service/notification/src/common/NSConstants.h
@@ -257,7 +257,8 @@ typedef enum eCacheType
 {
     NS_PROVIDER_CACHE_SUBSCRIBER = 1000,
     NS_PROVIDER_CACHE_MESSAGE = 1001,
-    NS_PROVIDER_CACHE_TOPIC = 1002,
+    NS_PROVIDER_CACHE_CONSUMER_TOPIC = 1002,
+    NS_PROVIDER_CACHE_REGISTER_TOPIC = 1003,
 
     NS_CONSUMER_CACHE_PROVIDER = 2000,
     NS_CONSUMER_CACHE_MESSAGE = 2001,

diff --git a/service/notification/src/provider/NSProviderInterface.c b/service/notification/src/provider/NSProviderInterface.c
index 3a54b11..80abe8a 100644 (file)
--- a/service/notification/src/provider/NSProviderInterface.c
+++ b/service/notification/src/provider/NSProviderInterface.c
@@ -98,6 +98,7 @@ void NSDestroyList()
     NSStorageDestroy(consumerSubList);\r
     NSStorageDestroy(messageList);\r
     NSStorageDestroy(consumerTopicList);\r
+    NSStorageDestroy(registeredTopicList);\r
 \r
     pthread_mutex_destroy(&NSCacheMutex);\r
     pthread_mutexattr_destroy(&NSCacheMutexAttr);\r

diff --git a/service/notification/src/provider/NSProviderTopic.c b/service/notification/src/provider/NSProviderTopic.c
index 44c5b65..4ba7da5 100644 (file)
--- a/service/notification/src/provider/NSProviderTopic.c
+++ b/service/notification/src/provider/NSProviderTopic.c
@@ -33,7 +33,11 @@ NSResult NSInitTopicList()
     }\r
 \r
     consumerTopicList = NSStorageCreate();\r
-    consumerTopicList->cacheType = NS_PROVIDER_CACHE_TOPIC;\r
+    consumerTopicList->cacheType = NS_PROVIDER_CACHE_CONSUMER_TOPIC;\r
+\r
+    registeredTopicList = NSStorageCreate();\r
+    registeredTopicList->cacheType = NS_PROVIDER_CACHE_REGISTER_TOPIC;\r
+\r
     isTopicList = true;\r
 \r
     NS_LOG(DEBUG, "NSInitTopicList - OUT");\r

diff --git a/service/notification/src/provider/NSProviderTopic.h b/service/notification/src/provider/NSProviderTopic.h
index 5f65e74..20e416e 100644 (file)
--- a/service/notification/src/provider/NSProviderTopic.h
+++ b/service/notification/src/provider/NSProviderTopic.h
@@ -29,6 +29,7 @@
 #include "NSProviderSubscription.h"\r
 \r
 NSCacheList * consumerTopicList;\r
+NSCacheList * registeredTopicList;\r
 \r
 NSResult NSInitTopicList();\r
 NSTopicList * NSGetTopics(char *consumerId);\r