net/tools/flip_server/flip_in_mem_edsm_server.cc - Issue 25085002: Break out balsa and epoll_server from net/tools/flip_server.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/tools/flip_server/flip_in_mem_edsm_server.cc

Issue 25085002: Break out balsa and epoll_server from net/tools/flip_server. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 7 years, 3 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:

Index: net/tools/flip_server/flip_in_mem_edsm_server.cc

diff --git a/net/tools/flip_server/flip_in_mem_edsm_server.cc b/net/tools/flip_server/flip_in_mem_edsm_server.cc

index ce7ffb8b05621125a4aa866245b2bb09ec454bdf..79f3e5b9af72450323903f31402beb665eed3224 100644

--- a/net/tools/flip_server/flip_in_mem_edsm_server.cc

+++ b/net/tools/flip_server/flip_in_mem_edsm_server.cc

@@ -15,6 +15,7 @@

#include "base/logging.h"

#include "base/synchronization/lock.h"

#include "base/timer/timer.h"

+#include "net/tools/balsa/split.h"

#include "net/tools/flip_server/acceptor_thread.h"

#include "net/tools/flip_server/constants.h"

#include "net/tools/flip_server/flip_config.h"

@@ -22,7 +23,6 @@

#include "net/tools/flip_server/sm_connection.h"

#include "net/tools/flip_server/sm_interface.h"

#include "net/tools/flip_server/spdy_interface.h"

-#include "net/tools/flip_server/split.h"

#include "net/tools/flip_server/streamer_interface.h"

using std::cout;

@@ -421,4 +421,3 @@ int main (int argc, char**argv)

close(pidfile_fd);

return 0;

}

« no previous file with comments | « net/tools/flip_server/epoll_server.cc ('k') | net/tools/flip_server/http_interface.h » ('j') | no next file with comments »