Browse Source

[2835] Rename enum item

SEGMENT_MAPPED may be misleading in case of locally-allocated memory.
Using SEGMENT_INUSE.
Michal 'vorner' Vaner 12 years ago
parent
commit
6fadd98cb5

+ 1 - 1
src/lib/datasrc/client_list.cc

@@ -482,7 +482,7 @@ ConfigurableClientList::getStatus() const {
         // TODO: Once we support mapped cache, decide when we need the
         // SEGMENT_WAITING.
         result.push_back(DataSourceStatus(info.name_, info.cache_ ?
-                                          SEGMENT_MAPPED : SEGMENT_UNUSED,
+                                          SEGMENT_INUSE : SEGMENT_UNUSED,
                                           SEGMENT_LOCAL));
     }
     return (result);

+ 1 - 1
src/lib/datasrc/client_list.h

@@ -61,7 +61,7 @@ enum MemorySegmentState {
     SEGMENT_WAITING,
 
     /// \brief The segment is ready to be used.
-    SEGMENT_MAPPED
+    SEGMENT_INUSE
 };
 
 /// \brief The type of the memory segment in cache

+ 3 - 3
src/lib/datasrc/tests/client_list_unittest.cc

@@ -578,7 +578,7 @@ TEST_F(ListTest, status) {
     EXPECT_EQ(SEGMENT_UNUSED, statuses[0].getSegmentState());
     EXPECT_THROW(statuses[0].getSegmentType(), isc::BadValue);
     EXPECT_EQ("Test name", statuses[1].getName());
-    EXPECT_EQ(SEGMENT_MAPPED, statuses[1].getSegmentState());
+    EXPECT_EQ(SEGMENT_INUSE, statuses[1].getSegmentState());
     EXPECT_EQ(SEGMENT_LOCAL, statuses[1].getSegmentType());
 }
 
@@ -1165,9 +1165,9 @@ TYPED_TEST(ReloadTest, reloadMasterFile) {
 
 // Check the status holds data and can change the segment state
 TEST(DataSourceStatus, status) {
-    const DataSourceStatus status("Test", SEGMENT_MAPPED, SEGMENT_LOCAL);
+    const DataSourceStatus status("Test", SEGMENT_INUSE, SEGMENT_LOCAL);
     EXPECT_EQ("Test", status.getName());
-    EXPECT_EQ(SEGMENT_MAPPED, status.getSegmentState());
+    EXPECT_EQ(SEGMENT_INUSE, status.getSegmentState());
     EXPECT_EQ(SEGMENT_LOCAL, status.getSegmentType());
     const DataSourceStatus statusUnused("Unused", SEGMENT_UNUSED, SEGMENT_FILE);
     EXPECT_EQ("Unused", statusUnused.getName());