Index: net/base/net_log_util.h |
diff --git a/net/base/net_log_util.h b/net/base/net_log_util.h |
index d9627da416e0161e93c8707bb068181f0742ccbb..d6d6857ae912bb0c1b25c7e161742a97087c5825 100644 |
--- a/net/base/net_log_util.h |
+++ b/net/base/net_log_util.h |
@@ -5,8 +5,11 @@ |
#ifndef NET_BASE_NET_LOG_UTIL_H_ |
#define NET_BASE_NET_LOG_UTIL_H_ |
+#include <set> |
+ |
#include "base/memory/scoped_ptr.h" |
#include "net/base/net_export.h" |
+#include "net/base/net_log.h" |
namespace base { |
class DictionaryValue; |
@@ -28,16 +31,38 @@ enum NetInfoSource { |
// Utility methods for creating NetLog dumps. |
-// Create a dictionary containing legend for net/ constants. |
+// Create a dictionary containing a legend for net/ constants. |
NET_EXPORT scoped_ptr<base::DictionaryValue> GetNetConstants(); |
// Retrieves a dictionary containing information about the current state of |
// |context|. |info_sources| is a set of NetInfoSources OR'd together, |
// indicating just what information is being requested. Each NetInfoSource adds |
// one top-level entry to the returned dictionary. |
+// |
+// May only be called on |context|'s thread. |
NET_EXPORT scoped_ptr<base::DictionaryValue> GetNetInfo( |
URLRequestContext* context, int info_sources); |
+// Takes in a set of contexts and a NetLog::Observer, and passes in |
+// NetLog::Entries to the observer for certain NetLog::Sources with pending |
+// events. This allows requests that were ongoing when logging was started to |
+// have an initial event that has some information. This is particularly useful |
+// for hung requests. Note that these calls are not protected by the NetLog's |
+// lock, so this should generally be invoked before the observer starts watching |
+// the NetLog. |
+// |
+// All members of |contexts| must be using the same NetLog, and live on the |
+// current thread. |
+// |
+// Currently only creates events for URLRequests. |
+// |
+// The reason for not returning a list of NetLog::Entries is that entries don't |
+// own most of their data, so it's simplest just to pass them in to the observer |
+// directly while their data is on the stack. |
+NET_EXPORT void CreateNetLogEntriesForActiveObjects( |
+ const std::set<URLRequestContext*>& contexts, |
+ NetLog::ThreadSafeObserver* observer); |
+ |
} // namespace net |
#endif // NET_BASE_NET_LOG_UTIL_H_ |