Changeset 2952

Timestamp:

04/27/06 13:21:37 (3 years ago)

Author:

madcat

Message:

More fixes for shared dirs removal/addition issues. Working correctly now.

Files:

• hydranode/hncgcomm/cgcomm.cpp (modified) (1 diff)
• hydranode/hncore/cgcomm/opcodes.h (modified) (1 diff)
• hydranode/hncore/cgcomm/sub_shared.cpp (modified) (2 diffs)
• hydranode/hncore/cgcomm/sub_shared.h (modified) (2 diffs)

hydranode/hncgcomm/cgcomm.cpp

@@ -664 +664 @@
-                        onRemoved(i->second);
-                        m_list.erase(i);
+                }
+                return;
+        } else if (oc == OC_CHANGEID) {
+                uint32_t oldId = Utils::getVal<uint32_t>(packet);
+                uint32_t newId = Utils::getVal<uint32_t>(packet);
+                Iter i = m_list.find(oldId);
+                if (i != m_list.end()) {
+                        SharedFilePtr obj = i->second;
+                        m_list.erase(i);
+                        obj->m_id = newId;
+                        m_list[newId] = obj;
-                }
-                return;

hydranode/hncore/cgcomm/opcodes.h

@@ -67 +67 @@
-        OC_CADDED   = 0x1d,  //!< Child was added to an object
-        OC_CREMOVED = 0x1e,  //!< Child was removed from an object
- 
-
+,
+
-};
-

hydranode/hncore/cgcomm/sub_shared.cpp

@@ -222 +222 @@
-                (*it)->setZombie();
-        } else if (it != m_cache.get<2>().end()) {
+                if (event == SF_METADATA_ADDED) {
+                        changeId(it);
+                        it = m_cache.get<2>().find(file);
+                        CHECK_THROW(it != m_cache.get<2>().end());
+                }
-                (*it)->update(file);
-        }
@@ -230 +235 @@
-        );
-} MSVC_ONLY(;)
+
+void Shared::changeId(FIter c) {
+        if ((*c)->getId() == getFId((*c)->m_file)) {
+                return;
+        }
+        uint32_t oldId = (*c)->getId();
+        uint32_t newId = getFId((*c)->m_file);
+        CacheEntry *cc = *c;
+
+        // preconditions
+        CHECK_THROW(m_cache.get<1>().find(newId) == m_cache.get<1>().end());
+
+        m_cache.get<2>().modify(
+                c, boost::lambda::bind(&CacheEntry::m_id, __1) = newId
+        );
+
+        // postconditions
+        CHECK_THROW(cc->getId() == newId);
+        CHECK_THROW(m_cache.get<1>().find(newId) != m_cache.get<1>().end());
+
+        std::ostringstream tmp;
+        Utils::putVal<uint8_t>(tmp, OC_CHANGEID);
+        Utils::putVal<uint32_t>(tmp, oldId);
+        Utils::putVal<uint32_t>(tmp, newId);
+        sendPacket(tmp.str());
+}
-
-void Shared::onMonitorTimer() try {

hydranode/hncore/cgcomm/sub_shared.h

@@ -64 +64 @@
-        };
-private:
-        void monitor(std::istream &i);
-        void addShared(std::istream &i);
-        void remShared(std::istream &i);
-        void sendList();
-        void rebuildCache();
-        void onEvent(SharedFile *file, int event);
-        void onMonitorTimer();
-
-        typedef boost::multi_index_container<
-                CacheEntry*,
@@ -94 +86 @@
-        typedef Cache::nth_index<1>::type::iterator IDIter;
-        typedef Cache::nth_index<2>::type::iterator FIter;
+
+        void monitor(std::istream &i);
+        void addShared(std::istream &i);
+        void remShared(std::istream &i);
+        void sendList();
+        void rebuildCache();
+        void onEvent(SharedFile *file, int event);
+        void onMonitorTimer();
+        void changeId(FIter i);
+
-        Cache m_cache;
-
-        uint32_t m_updateTimer;
-};