Changeset 634

Timestamp:

03/14/07 00:41:55 (18 months ago)

Author:

hyriand

Message:

Synced NewNet with r640. Downloadmanager now stores RefPtr?'s to Download classes. Logging is now sent to interfaces as IDebugMessage if EM_DEBUG is set.

Location:

branches/newnet/museekd

Files:

• . (modified) (1 prop)
• SConstruct (modified) (1 diff)
• museekd/downloadmanager.cpp (modified) (10 diffs)
• museekd/downloadmanager.h (modified) (4 diffs)
• museekd/ifacemanager.cpp (modified) (2 diffs)
• museekd/ifacemanager.h (modified) (3 diffs)
• museekd/ifacemessages.h (modified) (1 diff)
• museekd/main.cpp (modified) (1 diff)

branches/newnet/museekd

@@ -1 @@
-NewNet -r566 https://svn.thegraveyard.org:8043/repos/NewNet/trunk/NewNet
+NewNet -r640 https://svn.thegraveyard.org:8043/repos/NewNet/trunk/NewNet

@@ -1 @@
-NewNet -r566 https://svn.thegraveyard.org:8043/repos/NewNet/trunk/NewNet
+NewNet -r640 https://svn.thegraveyard.org:8043/repos/NewNet/trunk/NewNet

branches/newnet/museekd/SConstruct

@@ -3 +3 @@
 env.SConsignFile()
 env.Append(CCFLAGS = ['-Wall'])
+env.Append(LINKFLAGS = ['-Wall'])
 #env.Append(CPPDEFINES = ['NN_PTR_DEBUG'])
 env.Append(CPPDEFINES = ['NN_PTR_DEBUG', 'NN_PTR_DEBUG_ASSERT'])

branches/newnet/museekd/museekd/downloadmanager.cpp

@@ -39 +39 @@
 {
   // Check if this download already exits.
-  std::vector<Download>::iterator it = findDownload(user, path);
-  if(it == m_Downloads.end())
+  Download * download = findDownload(user, path);
+  if(! download)
   {
     // Create new download object.
-    Download download;
-    download.ticket = m_Museekd->token();
-    download.user = user;
-    download.path = path;
-    download.localPath = localPath;
-    download.state = TS_Offline;
+    download = new Download;
+    download->ticket = m_Museekd->token();
+    download->user = user;
+    download->path = path;
+    download->localPath = localPath;
+    download->state = TS_Offline;
     m_Downloads.push_back(download);
-    it = m_Downloads.end() - 1;
-    NNLOG("museek.debug", "Created new download entry, user=%s, path=%s, ticket=%u.", user.c_str(), path.c_str(), (*it).ticket);
-  }
-
-  (*it).state = TS_Offline;
+    NNLOG("museek.debug", "Created new download entry, user=%s, path=%s, ticket=%u.", user.c_str(), path.c_str(), download->ticket);
+  }
+
+  download->state = TS_Offline;
 
   /* If we have an active peer socket send the transfer request. If we don't
@@ -62 +61 @@
   {
     NNLOG("museek.debug", "Already have a socket for %s, sending download request.", user.c_str());
-    PTransferRequest msg((*it).ticket, path);
+    PTransferRequest msg(download->ticket, path);
     socket->sendMessage(msg.make_network_packet());
   }
@@ -103 +102 @@
 }
 
-std::vector<Museek::DownloadManager::Download>::iterator
+Museek::DownloadManager::Download *
 Museek::DownloadManager::findDownload(const std::string & user, const std::string & path)
 {
   // Iterate over m_Downloads until we find a match.
-  std::vector<Download>::iterator it, end = m_Downloads.end();
+  std::vector<NewNet::RefPtr<Download> >::iterator it, end = m_Downloads.end();
   for(it = m_Downloads.begin(); it != end; ++it)
   {
-    if(((*it).user == user) && ((*it).path == path))
-      return it;
-  }
-  return end;
-}
-
-std::vector<Museek::DownloadManager::Download>::iterator
+    if(((*it)->user == user) && ((*it)->path == path))
+      return *it;
+  }
+  return 0;
+}
+
+Museek::DownloadManager::Download *
 Museek::DownloadManager::findDownload(const std::string & user, uint ticket)
 {
   // Iterate over m_Downloads until we find a match.
-  std::vector<Download>::iterator it, end = m_Downloads.end();
+  std::vector<NewNet::RefPtr<Download> >::iterator it, end = m_Downloads.end();
   for(it = m_Downloads.begin(); it != end; ++it)
   {
-    if(((*it).user == user) && ((*it).ticket == ticket))
-      return it;
-  }
-  return end;
+    if(((*it)->user == user) && ((*it)->ticket == ticket))
+      return *it;
+  }
+  return 0;
 }
 
@@ -152 +151 @@
   {
     // Server connection was severed. As are our chances to connect to a peer.
-    std::vector<Download>::iterator it, end = m_Downloads.end();
+    std::vector<NewNet::RefPtr<Download> >::iterator it, end = m_Downloads.end();
     for(it = m_Downloads.begin(); it != end; ++it)
     {
-      (*it).state = TS_Offline;
+      (*it)->state = TS_Offline;
     }
   }
@@ -172 +171 @@
   if(message->status > 0)
   {
-    std::vector<Download> downloads;
+    std::vector<Download *> downloads;
     // Check if we have any downloads with status user offline for this user.
-    std::vector<Download>::iterator dit, dend = m_Downloads.end();
+    std::vector<NewNet::RefPtr<Download> >::iterator dit, dend = m_Downloads.end();
     for(dit = m_Downloads.begin(); dit != dend; ++dit)
     {
-      if(((*dit).user == message->user) && ((*dit).state == TS_Offline))
+      if(((*dit)->user == message->user) && ((*dit)->state == TS_Offline))
       {
         // Yep. Push it on the list.
@@ -202 +201 @@
 
     // Iterate of the downloads with status TS_Offline.
-    dend = downloads.end();
-    for(dit = downloads.begin(); dit != dend; ++dit)
-    {
-      // Find the reference to the original download.
-      std::vector<Download>::iterator it = findDownload((*dit).user, (*dit).path);
-      NNLOG("museek.debug", "Requesting download from %s, path=%s, ticket=%u", (*it).user.c_str(), (*it).path.c_str(), (*it).ticket);
+    std::vector<Download *>::iterator sit, send = downloads.end();
+    for(sit = downloads.begin(); sit != send; ++sit)
+    {
+      NNLOG("museek.debug", "Requesting download from %s, path=%s, ticket=%u", (*sit)->user.c_str(), (*sit)->path.c_str(), (*sit)->ticket);
       // Change the state to negotiating.
-      (*it).state = TS_Negotiating;
+      (*sit)->state = TS_Negotiating;
       // Send the transfer request.
-      PTransferRequest msg((*it).ticket, (*it).path);
+      PTransferRequest msg((*sit)->ticket, (*sit)->path);
       socket->sendMessage(msg.make_network_packet());
     }
@@ -235 +232 @@
 
   // Change status for pending transfers to 'cannot connect'.
-  std::vector<Download>::iterator dit, dend = m_Downloads.end();
+  std::vector<NewNet::RefPtr<Download> >::iterator dit, dend = m_Downloads.end();
   for(dit = m_Downloads.begin(); dit != dend; ++dit)
   {
-    if(((*dit).user == user) && ((*dit).state == TS_Negotiating))
-      (*dit).state = TS_CannotConnect;
+    if(((*dit)->user == user) && ((*dit)->state == TS_Negotiating))
+      (*dit)->state = TS_CannotConnect;
   }
 }
@@ -248 +245 @@
   // Find the download this concerns.
   const std::string & user = message->peerSocket()->user();
-  std::vector<Download>::iterator it = findDownload(user, message->ticket);
-  if(it == m_Downloads.end())
+  Download * download = findDownload(user, message->ticket);
+  if(! download)
     return; // No such download, bail out.
 
@@ -255 +252 @@
   {
     // Transfer can start immediately, no queue at remote end.
-    NNLOG("museek.debug", "Got transfer reply: user=%s,path=%s,ticket=%u,allowed=yes,filesize=%llu", user.c_str(), (*it).path.c_str(), (*it).ticket, message->filesize);
+    NNLOG("museek.debug", "Got transfer reply: user=%s,path=%s,ticket=%u,allowed=yes,filesize=%llu", user.c_str(), download->path.c_str(), download->ticket, message->filesize);
     NNLOG("museek.debug", "Ehm.. We're supposed to do something here: connect to %s and claim our prize...", user.c_str());
   }
@@ -261 +258 @@
   {
     // Transfer (currently) not possible.
-    NNLOG("museek.debug", "Got transfer reply: user=%s,path=%s,ticket=%u,allowed=no,reason=%s", user.c_str(), (*it).path.c_str(), (*it).ticket, message->reason.c_str());
-    (*it).state = TS_RemoteError;
-    (*it).error = message->reason;
-  }
-}
+    NNLOG("museek.debug", "Got transfer reply: user=%s,path=%s,ticket=%u,allowed=no,reason=%s", user.c_str(), download->path.c_str(), download->ticket, message->reason.c_str());
+    download->state = TS_RemoteError;
+    download->error = message->reason;
+  }
+}

branches/newnet/museekd/museekd/downloadmanager.h

@@ -23 +23 @@
 #include <NewNet/nnobject.h>
 #include <NewNet/nnweakrefptr.h>
+#include <NewNet/nnrefptr.h>
 #include "mutypes.h"
 
@@ -44 +45 @@
   public:
     /* Definition of the download structure. */
-    typedef struct
+    class Download : public NewNet::Object
     {
+    public:
       uint ticket; // The download ticket with which this download is identified
       std::string user, path, localPath;
       TrState state; // Transfer state (see mutypes.h)
       std::string error; // Error message if state = TR_Error
-    } Download;
+    };
 
     DownloadManager(Museekd * museekd);
@@ -70 +72 @@
   protected:
     /* Find a download by it's path. */
-    std::vector<Download>::iterator findDownload(const std::string & user, const std::string & path);
+    Download * findDownload(const std::string & user, const std::string & path);
     /* Find a download by it's ticket. */
-    std::vector<Download>::iterator findDownload(const std::string & user, uint ticket);
+    Download * findDownload(const std::string & user, uint ticket);
 
     /* Find or make a peer socket for the specified user. */
@@ -84 +86 @@
 
     NewNet::WeakRefPtr<Museekd> m_Museekd;
-    std::vector<Download> m_Downloads;
+    std::vector<NewNet::RefPtr<Download> > m_Downloads;
     std::map<std::string, NewNet::WeakRefPtr<PeerSocket> > m_Peers;
   };

branches/newnet/museekd/museekd/ifacemanager.cpp

@@ -66 +66 @@
   m_AwayState = 0;
 
+  NNLOG.logEvent.connect(this, &IfaceManager::onLog);
+
   museekd->config()->keySetEvent.connect(this, &IfaceManager::onConfigKeySet);
   museekd->config()->keyRemovedEvent.connect(this, &IfaceManager::onConfigKeyRemoved);
@@ -154 +156 @@
   m_ServerSockets.erase(it);
   m_Factories.erase(m_Factories.find(path));
+}
+
+void
+Museek::IfaceManager::onLog(const NewNet::Log::LogNotify * log)
+{
+  SEND_MASK(EM_DEBUG, IDebugMessage(log->domain, log->message));
 }
 

branches/newnet/museekd/museekd/ifacemanager.h

@@ -54 +54 @@
       EM_USERSHARES = 16,
       EM_INTERESTS = 32,
-      EM_CONFIG = 64
+      EM_CONFIG = 64,
+      EM_DEBUG = 128
     };
 
@@ -69 +70 @@
 
     void flushPrivateMessages();
+
+    // Log event handler:
+    void onLog(const NewNet::Log::LogNotify * notice);
 
     // Config changed listener events:
@@ -133 +137 @@
     void onServerItemSimilarUsersReceived(const SGetItemSimilarUsers * message);
     void onServerUserInterestsReceived(const SUserInterests * message);
+
     // Peer event handlers:
     void onPeerCannotConnect(NewNet::ClientSocket * socket);

branches/newnet/museekd/museekd/ifacemessages.h

@@ -284 +284 @@
         bool type;
         std::string message;
+END
+
+IFACEMESSAGE(IDebugMessage, 0x0011)
+/*
+        Debug Message -- Forward debug messages to the clients
+        
+        *not sent*
+        
+        string domain -- Contains the domain the debug message was emitted in
+        string message -- Contains the debug message
+*/
+        
+        IDebugMessage(const std::string& _d, const std::string& _m) : domain(_d), message(_m) { }
+
+        MAKE
+                pack(domain);
+                pack(message);
+        END_MAKE
+
+        std::string domain, message;
 END
 

branches/newnet/museekd/museekd/main.cpp

@@ -74 +74 @@
 };
 
+class LogCallback : public NewNet::Event<const NewNet::Log::LogNotify *>::Callback
+{
+public:
+  virtual void operator()(const NewNet::Log::LogNotify * notice)
+  {
+    std::cerr << "[" << notice->domain << "] " << notice->message << std::endl;
+  }
+};
+
 int main(int argc, char ** argv)
 {
   /* Enable various interesting logging domains. */
+  NNLOG.logEvent.connect(new LogCallback);
   NNLOG.enable("ALL");
 

@@ -1 @@
-NewNet -r566 https://svn.thegraveyard.org:8043/repos/NewNet/trunk/NewNet
+NewNet -r640 https://svn.thegraveyard.org:8043/repos/NewNet/trunk/NewNet