Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(648)

Unified Diff: net/socket/client_socket_pool_base.h

Issue 1982263003: Remove Windows XP specific socket cleanup timer from net/socket. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: re-add tests Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | net/socket/client_socket_pool_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/client_socket_pool_base.h
diff --git a/net/socket/client_socket_pool_base.h b/net/socket/client_socket_pool_base.h
index 74e65235d43cfec1177786b6c07d9b5a70f16ef3..a5e17b380366f513ef37a1590c5c1fa95449ef20 100644
--- a/net/socket/client_socket_pool_base.h
+++ b/net/socket/client_socket_pool_base.h
@@ -314,14 +314,6 @@ class NET_EXPORT_PRIVATE ClientSocketPoolBaseHelper
bool HasGroup(const std::string& group_name) const;
- // Called to enable/disable cleaning up idle sockets. When enabled,
- // idle sockets that have been around for longer than a period defined
- // by kCleanupInterval are cleaned up using a timer. Otherwise they are
- // closed next time client makes a request. This may reduce network
- // activity and power consumption.
- static bool cleanup_timer_enabled();
- static bool set_cleanup_timer_enabled(bool enabled);
-
// Closes all idle sockets if |force| is true. Else, only closes idle
// sockets that timed out or can't be reused. Made public for testing.
void CleanupIdleSockets(bool force);
@@ -533,21 +525,12 @@ class NET_EXPORT_PRIVATE ClientSocketPoolBaseHelper
void IncrementIdleCount();
void DecrementIdleCount();
- // Start cleanup timer for idle sockets.
- void StartIdleSocketTimer();
-
// Scans the group map for groups which have an available socket slot and
// at least one pending request. Returns true if any groups are stalled, and
// if so (and if both |group| and |group_name| are not NULL), fills |group|
// and |group_name| with data of the stalled group having highest priority.
bool FindTopStalledGroup(Group** group, std::string* group_name) const;
- // Called when timer_ fires. This method scans the idle sockets removing
- // sockets that timed out or can't be reused.
- void OnCleanupTimerFired() {
- CleanupIdleSockets(false);
- }
-
// Removes |job| from |group|, which must already own |job|.
void RemoveConnectJob(ConnectJob* job, Group* group);
@@ -625,10 +608,6 @@ class NET_EXPORT_PRIVATE ClientSocketPoolBaseHelper
// possible that the request is cancelled.
PendingCallbackMap pending_callback_map_;
- // Timer used to periodically prune idle sockets that timed out or can't be
- // reused.
- base::RepeatingTimer timer_;
-
// The total number of idle sockets in the system.
int idle_socket_count_;
@@ -644,9 +623,6 @@ class NET_EXPORT_PRIVATE ClientSocketPoolBaseHelper
// The maximum number of sockets kept per group.
const int max_sockets_per_group_;
- // Whether to use timer to cleanup idle sockets.
- bool use_cleanup_timer_;
-
// The time to wait until closing idle sockets.
const base::TimeDelta unused_idle_socket_timeout_;
const base::TimeDelta used_idle_socket_timeout_;
« no previous file with comments | « no previous file | net/socket/client_socket_pool_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698