First pass at adding http/backend cache to NetLog

net/base/net_log_event_type_list.h

Index: net/base/net_log_event_type_list.h
===================================================================
--- net/base/net_log_event_type_list.h	(revision 68857)
+++ net/base/net_log_event_type_list.h	(working copy)
@@ -495,27 +495,174 @@
 EVENT_TYPE(URL_REQUEST_REDIRECTED)
 
 // ------------------------------------------------------------------------
-// HttpCache
+// HttpCache::Transaction
 // ------------------------------------------------------------------------
 
+// Measures the time while getting a reference to the back end.
+EVENT_TYPE(HTTP_CACHE_GET_BACKEND)
+
 // Measures the time while opening a disk cache entry.
 EVENT_TYPE(HTTP_CACHE_OPEN_ENTRY)
 
 // Measures the time while creating a disk cache entry.
 EVENT_TYPE(HTTP_CACHE_CREATE_ENTRY)
 
+// Measures the time it takes to add a HttpCache::Transaction to an http cache
+// entry's list of active Transactions.
+EVENT_TYPE(HTTP_CACHE_ADD_TO_ENTRY)
+
 // Measures the time while deleting a disk cache entry.
 EVENT_TYPE(HTTP_CACHE_DOOM_ENTRY)
 
-// Measures the time while reading the response info from a disk cache entry.
+// Measures the time while reading/writing a disk cache entry's response headers
+// or metadata.
 EVENT_TYPE(HTTP_CACHE_READ_INFO)
+EVENT_TYPE(HTTP_CACHE_WRITE_INFO)
 
-// Measures the time that an HttpCache::Transaction is stalled waiting for
-// the cache entry to become available (for example if we are waiting for
-// exclusive access to an existing entry).
-EVENT_TYPE(HTTP_CACHE_WAITING)
+// Measures the time while reading/writing a disk cache entry's body.
+EVENT_TYPE(HTTP_CACHE_READ_DATA)
+EVENT_TYPE(HTTP_CACHE_WRITE_DATA)
 
 // ------------------------------------------------------------------------
+// HttpCache::ActiveEntry
+// ------------------------------------------------------------------------
+
+// Marks the creation/destruction of an HttpCache::ActiveEntry.  Note that the
+// ActiveEntry is only created once a disk_cache::Entry is created and passed to
+// HttpCache on the IOThread.
+//
+// The BEGIN phase has the following parameters:
+//   {
+//     "key": <Key associated with the corresponding disk_cache::Entry>
+//     "source_dependency": <Source id of the corresponding disk_cache::Entry>
+//   }
+EVENT_TYPE(HTTP_CACHE_ACTIVE_ENTRY)
+
+// Logged when a Transaction is added to an ActiveEntry's queue.
+//
+// The following parameters are attached:
+//   {
+//     "source_dependency": <Source id of the Transaction>
+//     "queue_length": <Length of the queue, with the Transaction added>
+//   }
+EVENT_TYPE(ACTIVE_ENTRY_ADD_TO_QUEUE)
+
+// Logged when an ActiveEntry's writer Transaction is set/cleared.
+//
+// The BEGIN phase has the following parameters:
+//   {
+//     "source_dependency": <Source id of the Transaction>
+//     "queue_length": <Length of entry's queue.  Only present when non-zero>
+//   }
+EVENT_TYPE(ACTIVE_ENTRY_SET_WRITER)
+
+// Logged when a reader Transaction is added to an ActiveEntry's active reader
+// list.
+//
+// The following parameters are attached:
+//   {
+//     "source_dependency": <Source id of the Transaction>
+//     "queue_length": <Length of entry's queue.  Only present when non-zero.
+//                      Note that presence of this field does not necessarily
+//                      indicate that the Transaction came from the queue, due
+//                      to different treatment of read and write Transactions>
+//   }
+EVENT_TYPE(ACTIVE_ENTRY_ADD_READER)
+
+// Logged when a reader Transaction is removed from an ActiveEntry's active
+// reader list.  As multiple readers can be active as once, this cannot be done
+// as an end event for HTTP_CACHE_ADD_READER.
+//
+// The following parameters are attached:
+//   {
+//     "source_dependency": <Source id of the Transaction>
+//   }
+EVENT_TYPE(ACTIVE_ENTRY_REMOVE_READER)
+
+// Logged when a pending Transaction is removed from an ActiveEntry's queue,
+// without ever being added as a reader or writer.
+//
+// The following parameters are attached:
+//   {
+//     "source_dependency": <Source id of the corresponding Transaction>
+//   }
+EVENT_TYPE(ACTIVE_ENTRY_REMOVE_PENDING_TRANSACTION)
+
+// Logged when an ActiveEntry is being deactived, which happens when it has no
+// remaining Transactions and is not doomed.
+EVENT_TYPE(ACTIVE_ENTRY_DEACTIVATE)
+
+// Logged when an ActiveEntry is being closed.
+EVENT_TYPE(ACTIVE_ENTRY_CLOSE)
+
+// Logged when an ActiveEntry is being doomed.
+EVENT_TYPE(ACTIVE_ENTRY_DOOM)
+
+// Logged when an ActiveEntry that is doomed is being destroyed.
+EVENT_TYPE(ACTIVE_ENTRY_FINALIZE_DOOMED_ENTRY)
+
+// ------------------------------------------------------------------------
+// Disk Cache
+// ------------------------------------------------------------------------
+
+// The creation/destruction of a disk_cache::EntryImpl object.  The "creation"
+// is considered to be the point at which an Entry is first considered to be
+// good and associated with a key.
+//
+// For the BEGIN phase, the following parameters are attached:
+//   {
+//     "created": <true if the Entry was created, rather than being opened>;
+//     "key": <The Entry's key>;
+//   }
+EVENT_TYPE(DISK_CACHE_ENTRY)
+
+// Logs the time required to read/write data from/to a cache entry.
+//
+// For the BEGIN phase, the following parameters are attached:
+//   {
+//     "index": <index being read/written>;
+//     "offset": <offset being read/written>;
+//     "buf_len": <length of buffer being read to/written from>;
+//     "truncate": <If present for a write, the truncate flag is set to true.
+//                  Not present in reads or writes where it is false>
+//   }
+EVENT_TYPE(DISK_CACHE_READ_DATA)
+EVENT_TYPE(DISK_CACHE_WRITE_DATA)
+
+// Logged when SparseControl starts/stops handling IO for an Entry.
+EVENT_TYPE(SPARSE_CONTROL)
+
+// Logged when SparseControl starts/stops reading/writing a child Entry's data
+//
+// For the BEGIN phase, the following parameters are attached:
+//   {
+//     "source_dependency": <Source id of the child entry>
+//   }
+EVENT_TYPE(SPARSE_CONTROL_READ)
+EVENT_TYPE(SPARSE_CONTROL_WRITE)
+
+// Indicates the time taken by a sparse control to get a range.
+EVENT_TYPE(SPARSE_CONTROL_GET_RANGE)
+
+// Logged when an entry is closed.
+EVENT_TYPE(DISK_CACHE_CLOSE)
+
+// Logged when an entry is doomed.
+EVENT_TYPE(DISK_CACHE_DOOM)
+
+// The following events are logged for an entry when an action of the
+// corresponding type is queued on the IO Thread by the BackendIO.  Note that
+// while open and create events are queued much like the others, no
+// Entry exists when the events occur, so they are not logged for an entry.
+EVENT_TYPE(DISK_CACHE_QUEUE_READ_DATA)
+EVENT_TYPE(DISK_CACHE_QUEUE_WRITE_DATA)
+EVENT_TYPE(DISK_CACHE_QUEUE_READ_SPARSE)
+EVENT_TYPE(DISK_CACHE_QUEUE_WRITE_SPARSE)
+EVENT_TYPE(DISK_CACHE_QUEUE_GET_RANGE)
+EVENT_TYPE(DISK_CACHE_QUEUE_CLOSE)
+EVENT_TYPE(DISK_CACHE_QUEUE_DOOM)
+
+// ------------------------------------------------------------------------
 // HttpNetworkTransaction
 // ------------------------------------------------------------------------