summaryrefslogtreecommitdiffstats
path: root/net/tools
diff options
context:
space:
mode:
Diffstat (limited to 'net/tools')
-rw-r--r--net/tools/flip_server/acceptor_thread.h19
-rw-r--r--net/tools/flip_server/balsa_frame.h34
-rw-r--r--net/tools/flip_server/epoll_server.h9
-rw-r--r--net/tools/flip_server/http_interface.h78
-rw-r--r--net/tools/flip_server/mem_cache.h34
-rw-r--r--net/tools/flip_server/output_ordering.h11
-rw-r--r--net/tools/flip_server/ring_buffer.h27
-rw-r--r--net/tools/flip_server/simple_buffer.h29
-rw-r--r--net/tools/flip_server/sm_connection.h21
-rw-r--r--net/tools/flip_server/spdy_interface.h55
-rw-r--r--net/tools/flip_server/streamer_interface.h78
11 files changed, 210 insertions, 185 deletions
diff --git a/net/tools/flip_server/acceptor_thread.h b/net/tools/flip_server/acceptor_thread.h
index b378e4d..f967fac 100644
--- a/net/tools/flip_server/acceptor_thread.h
+++ b/net/tools/flip_server/acceptor_thread.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -9,6 +9,7 @@
#include <string>
#include <vector>
+#include "base/compiler_specific.h"
#include "base/threading/simple_thread.h"
#include "net/tools/flip_server/epoll_server.h"
#include "net/tools/flip_server/sm_interface.h"
@@ -49,14 +50,16 @@ class SMAcceptorThread : public base::SimpleThread,
virtual ~SMAcceptorThread();
// EpollCallbackInteface interface
- virtual void OnRegistration(EpollServer* eps, int fd, int event_mask) {}
- virtual void OnModification(int fd, int event_mask) {}
- virtual void OnEvent(int fd, EpollEvent* event);
- virtual void OnUnregistration(int fd, bool replaced) {}
- virtual void OnShutdown(EpollServer* eps, int fd) {}
+ virtual void OnRegistration(EpollServer* eps,
+ int fd,
+ int event_mask) OVERRIDE {}
+ virtual void OnModification(int fd, int event_mask) OVERRIDE {}
+ virtual void OnEvent(int fd, EpollEvent* event) OVERRIDE;
+ virtual void OnUnregistration(int fd, bool replaced) OVERRIDE {}
+ virtual void OnShutdown(EpollServer* eps, int fd) OVERRIDE {}
// SMConnectionPool interface
- virtual void SMConnectionDone(SMConnection* sc);
+ virtual void SMConnectionDone(SMConnection* sc) OVERRIDE;
// TODO(mbelshe): figure out if we can move these to private functions.
SMConnection* NewConnection();
@@ -72,7 +75,7 @@ class SMAcceptorThread : public base::SimpleThread,
// idle longer than the configured timeout.
void HandleConnectionIdleTimeout();
- virtual void Run();
+ virtual void Run() OVERRIDE;
private:
EpollServer epoll_server_;
diff --git a/net/tools/flip_server/balsa_frame.h b/net/tools/flip_server/balsa_frame.h
index 74ff7bc..5b6c265 100644
--- a/net/tools/flip_server/balsa_frame.h
+++ b/net/tools/flip_server/balsa_frame.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -11,6 +11,7 @@
#include <utility>
#include <vector>
+#include "base/compiler_specific.h"
#include "base/port.h"
#include "net/tools/flip_server/balsa_enums.h"
#include "net/tools/flip_server/balsa_headers.h"
@@ -203,11 +204,11 @@ class BalsaFrame {
private:
class DoNothingBalsaVisitor : public BalsaVisitorInterface {
- virtual void ProcessBodyInput(const char *input, size_t size) {}
- virtual void ProcessBodyData(const char *input, size_t size) {}
- virtual void ProcessHeaderInput(const char *input, size_t size) {}
- virtual void ProcessTrailerInput(const char *input, size_t size) {}
- virtual void ProcessHeaders(const BalsaHeaders& headers) {}
+ virtual void ProcessBodyInput(const char *input, size_t size) OVERRIDE {}
+ virtual void ProcessBodyData(const char *input, size_t size) OVERRIDE {}
+ virtual void ProcessHeaderInput(const char *input, size_t size) OVERRIDE {}
+ virtual void ProcessTrailerInput(const char *input, size_t size) OVERRIDE {}
+ virtual void ProcessHeaders(const BalsaHeaders& headers) OVERRIDE {}
virtual void ProcessRequestFirstLine(const char* line_input,
size_t line_length,
const char* method_input,
@@ -215,7 +216,7 @@ class BalsaFrame {
const char* request_uri_input,
size_t request_uri_length,
const char* version_input,
- size_t version_length) {}
+ size_t version_length) OVERRIDE {}
virtual void ProcessResponseFirstLine(const char *line_input,
size_t line_length,
const char *version_input,
@@ -223,15 +224,16 @@ class BalsaFrame {
const char *status_input,
size_t status_length,
const char *reason_input,
- size_t reason_length) {}
- virtual void ProcessChunkLength(size_t chunk_length) {}
- virtual void ProcessChunkExtensions(const char *input, size_t size) {}
- virtual void HeaderDone() {}
- virtual void MessageDone() {}
- virtual void HandleHeaderError(BalsaFrame* framer) {}
- virtual void HandleHeaderWarning(BalsaFrame* framer) {}
- virtual void HandleChunkingError(BalsaFrame* framer) {}
- virtual void HandleBodyError(BalsaFrame* framer) {}
+ size_t reason_length) OVERRIDE {}
+ virtual void ProcessChunkLength(size_t chunk_length) OVERRIDE {}
+ virtual void ProcessChunkExtensions(const char *input,
+ size_t size) OVERRIDE {}
+ virtual void HeaderDone() OVERRIDE {}
+ virtual void MessageDone() OVERRIDE {}
+ virtual void HandleHeaderError(BalsaFrame* framer) OVERRIDE {}
+ virtual void HandleHeaderWarning(BalsaFrame* framer) OVERRIDE {}
+ virtual void HandleChunkingError(BalsaFrame* framer) OVERRIDE {}
+ virtual void HandleBodyError(BalsaFrame* framer) OVERRIDE {}
};
bool last_char_was_slash_r_;
diff --git a/net/tools/flip_server/epoll_server.h b/net/tools/flip_server/epoll_server.h
index 56496c0..bf6ca082 100644
--- a/net/tools/flip_server/epoll_server.h
+++ b/net/tools/flip_server/epoll_server.h
@@ -36,6 +36,7 @@
#endif
#include "base/basictypes.h"
+#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
#include <sys/epoll.h>
@@ -1033,17 +1034,17 @@ class EpollAlarm : public EpollAlarmCallbackInterface {
// Marks the alarm as unregistered and returns 0. The return value may be
// safely ignored by subclasses.
- virtual int64 OnAlarm();
+ virtual int64 OnAlarm() OVERRIDE;
// Marks the alarm as registered, and stores the token.
virtual void OnRegistration(const EpollServer::AlarmRegToken& token,
- EpollServer* eps);
+ EpollServer* eps) OVERRIDE;
// Marks the alarm as unregistered.
- virtual void OnUnregistration();
+ virtual void OnUnregistration() OVERRIDE;
// Marks the alarm as unregistered.
- virtual void OnShutdown(EpollServer* eps);
+ virtual void OnShutdown(EpollServer* eps) OVERRIDE;
// If the alarm was registered, unregister it.
void UnregisterIfRegistered();
diff --git a/net/tools/flip_server/http_interface.h b/net/tools/flip_server/http_interface.h
index 78d3dca..e311881 100644
--- a/net/tools/flip_server/http_interface.h
+++ b/net/tools/flip_server/http_interface.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -7,6 +7,7 @@
#include <string>
+#include "base/compiler_specific.h"
#include "net/tools/flip_server/balsa_headers.h"
#include "net/tools/flip_server/balsa_visitor_interface.h"
#include "net/tools/flip_server/output_ordering.h"
@@ -33,11 +34,11 @@ class HttpSM : public BalsaVisitorInterface,
private:
// BalsaVisitorInterface:
- virtual void ProcessBodyInput(const char *input, size_t size) {}
- virtual void ProcessBodyData(const char *input, size_t size);
- virtual void ProcessHeaderInput(const char *input, size_t size) {}
- virtual void ProcessTrailerInput(const char *input, size_t size) {}
- virtual void ProcessHeaders(const BalsaHeaders& headers);
+ virtual void ProcessBodyInput(const char *input, size_t size) OVERRIDE {}
+ virtual void ProcessBodyData(const char *input, size_t size) OVERRIDE;
+ virtual void ProcessHeaderInput(const char *input, size_t size) OVERRIDE {}
+ virtual void ProcessTrailerInput(const char *input, size_t size) OVERRIDE {}
+ virtual void ProcessHeaders(const BalsaHeaders& headers) OVERRIDE;
virtual void ProcessRequestFirstLine(const char* line_input,
size_t line_length,
const char* method_input,
@@ -45,7 +46,7 @@ class HttpSM : public BalsaVisitorInterface,
const char* request_uri_input,
size_t request_uri_length,
const char* version_input,
- size_t version_length) {}
+ size_t version_length) OVERRIDE {}
virtual void ProcessResponseFirstLine(const char *line_input,
size_t line_length,
const char *version_input,
@@ -53,15 +54,16 @@ class HttpSM : public BalsaVisitorInterface,
const char *status_input,
size_t status_length,
const char *reason_input,
- size_t reason_length) {}
- virtual void ProcessChunkLength(size_t chunk_length) {}
- virtual void ProcessChunkExtensions(const char *input, size_t size) {}
- virtual void HeaderDone() {}
- virtual void MessageDone();
- virtual void HandleHeaderError(BalsaFrame* framer);
- virtual void HandleHeaderWarning(BalsaFrame* framer) {}
- virtual void HandleChunkingError(BalsaFrame* framer);
- virtual void HandleBodyError(BalsaFrame* framer);
+ size_t reason_length) OVERRIDE {}
+ virtual void ProcessChunkLength(size_t chunk_length) OVERRIDE {}
+ virtual void ProcessChunkExtensions(const char *input,
+ size_t size) OVERRIDE {}
+ virtual void HeaderDone() OVERRIDE {}
+ virtual void MessageDone() OVERRIDE;
+ virtual void HandleHeaderError(BalsaFrame* framer) OVERRIDE;
+ virtual void HandleHeaderWarning(BalsaFrame* framer) OVERRIDE {}
+ virtual void HandleChunkingError(BalsaFrame* framer) OVERRIDE;
+ virtual void HandleBodyError(BalsaFrame* framer) OVERRIDE;
void HandleError();
@@ -69,11 +71,11 @@ class HttpSM : public BalsaVisitorInterface,
void AddToOutputOrder(const MemCacheIter& mci);
void SendOKResponse(uint32 stream_id, std::string* output);
BalsaFrame* spdy_framer() { return http_framer_; }
- virtual void set_is_request() {}
+ virtual void set_is_request() OVERRIDE {}
// SMInterface:
virtual void InitSMInterface(SMInterface* sm_spdy_interface,
- int32 server_idx);
+ int32 server_idx) OVERRIDE;
virtual void InitSMConnection(SMConnectionPoolInterface* connection_pool,
SMInterface* sm_interface,
EpollServer* epoll_server,
@@ -81,27 +83,29 @@ class HttpSM : public BalsaVisitorInterface,
std::string server_ip,
std::string server_port,
std::string remote_ip,
- bool use_ssl);
- virtual size_t ProcessReadInput(const char* data, size_t len);
- virtual size_t ProcessWriteInput(const char* data, size_t len);
- virtual bool MessageFullyRead() const;
- virtual void SetStreamID(uint32 stream_id);
- virtual bool Error() const;
- virtual const char* ErrorAsString() const;
- virtual void Reset();
- virtual void ResetForNewInterface(int32 server_idx) {}
- virtual void ResetForNewConnection();
- virtual void Cleanup();
- virtual int PostAcceptHook();
+ bool use_ssl) OVERRIDE;
+ virtual size_t ProcessReadInput(const char* data, size_t len) OVERRIDE;
+ virtual size_t ProcessWriteInput(const char* data, size_t len) OVERRIDE;
+ virtual bool MessageFullyRead() const OVERRIDE;
+ virtual void SetStreamID(uint32 stream_id) OVERRIDE;
+ virtual bool Error() const OVERRIDE;
+ virtual const char* ErrorAsString() const OVERRIDE;
+ virtual void Reset() OVERRIDE;
+ virtual void ResetForNewInterface(int32 server_idx) OVERRIDE {}
+ virtual void ResetForNewConnection() OVERRIDE;
+ virtual void Cleanup() OVERRIDE;
+ virtual int PostAcceptHook() OVERRIDE;
virtual void NewStream(uint32 stream_id, uint32 priority,
- const std::string& filename);
- virtual void SendEOF(uint32 stream_id);
- virtual void SendErrorNotFound(uint32 stream_id);
- virtual size_t SendSynStream(uint32 stream_id, const BalsaHeaders& headers);
- virtual size_t SendSynReply(uint32 stream_id, const BalsaHeaders& headers);
+ const std::string& filename) OVERRIDE;
+ virtual void SendEOF(uint32 stream_id) OVERRIDE;
+ virtual void SendErrorNotFound(uint32 stream_id) OVERRIDE;
+ virtual size_t SendSynStream(uint32 stream_id,
+ const BalsaHeaders& headers) OVERRIDE;
+ virtual size_t SendSynReply(uint32 stream_id,
+ const BalsaHeaders& headers) OVERRIDE;
virtual void SendDataFrame(uint32 stream_id, const char* data, int64 len,
- uint32 flags, bool compress);
+ uint32 flags, bool compress) OVERRIDE;
private:
void SendEOFImpl(uint32 stream_id);
@@ -112,7 +116,7 @@ class HttpSM : public BalsaVisitorInterface,
void SendDataFrameImpl(uint32 stream_id, const char* data, int64 len,
uint32 flags, bool compress);
void EnqueueDataFrame(DataFrame* df);
- virtual void GetOutput();
+ virtual void GetOutput() OVERRIDE;
private:
uint64 seq_num_;
diff --git a/net/tools/flip_server/mem_cache.h b/net/tools/flip_server/mem_cache.h
index a7187bf..cf5b9bd 100644
--- a/net/tools/flip_server/mem_cache.h
+++ b/net/tools/flip_server/mem_cache.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -9,6 +9,7 @@
#include <string>
#include <vector>
+#include "base/compiler_specific.h"
#include "net/tools/flip_server/balsa_headers.h"
#include "net/tools/flip_server/balsa_visitor_interface.h"
#include "net/tools/flip_server/constants.h"
@@ -20,11 +21,11 @@ class StoreBodyAndHeadersVisitor: public BalsaVisitorInterface {
void HandleError() { error_ = true; }
// BalsaVisitorInterface:
- virtual void ProcessBodyInput(const char *input, size_t size) {}
- virtual void ProcessBodyData(const char *input, size_t size);
- virtual void ProcessHeaderInput(const char *input, size_t size) {}
- virtual void ProcessTrailerInput(const char *input, size_t size) {}
- virtual void ProcessHeaders(const BalsaHeaders& headers) {
+ virtual void ProcessBodyInput(const char *input, size_t size) OVERRIDE {}
+ virtual void ProcessBodyData(const char *input, size_t size) OVERRIDE;
+ virtual void ProcessHeaderInput(const char *input, size_t size) OVERRIDE {}
+ virtual void ProcessTrailerInput(const char *input, size_t size) OVERRIDE {}
+ virtual void ProcessHeaders(const BalsaHeaders& headers) OVERRIDE {
// nothing to do here-- we're assuming that the BalsaFrame has
// been handed our headers.
}
@@ -35,7 +36,7 @@ class StoreBodyAndHeadersVisitor: public BalsaVisitorInterface {
const char* request_uri_input,
size_t request_uri_length,
const char* version_input,
- size_t version_length) {}
+ size_t version_length) OVERRIDE {}
virtual void ProcessResponseFirstLine(const char *line_input,
size_t line_length,
const char *version_input,
@@ -43,15 +44,16 @@ class StoreBodyAndHeadersVisitor: public BalsaVisitorInterface {
const char *status_input,
size_t status_length,
const char *reason_input,
- size_t reason_length) {}
- virtual void ProcessChunkLength(size_t chunk_length) {}
- virtual void ProcessChunkExtensions(const char *input, size_t size) {}
- virtual void HeaderDone() {}
- virtual void MessageDone() {}
- virtual void HandleHeaderError(BalsaFrame* framer);
- virtual void HandleHeaderWarning(BalsaFrame* framer);
- virtual void HandleChunkingError(BalsaFrame* framer);
- virtual void HandleBodyError(BalsaFrame* framer);
+ size_t reason_length) OVERRIDE {}
+ virtual void ProcessChunkLength(size_t chunk_length) OVERRIDE {}
+ virtual void ProcessChunkExtensions(const char *input,
+ size_t size) OVERRIDE {}
+ virtual void HeaderDone() OVERRIDE {}
+ virtual void MessageDone() OVERRIDE {}
+ virtual void HandleHeaderError(BalsaFrame* framer) OVERRIDE;
+ virtual void HandleHeaderWarning(BalsaFrame* framer) OVERRIDE;
+ virtual void HandleChunkingError(BalsaFrame* framer) OVERRIDE;
+ virtual void HandleBodyError(BalsaFrame* framer) OVERRIDE;
BalsaHeaders headers;
std::string body;
diff --git a/net/tools/flip_server/output_ordering.h b/net/tools/flip_server/output_ordering.h
index 659775f..5ece610 100644
--- a/net/tools/flip_server/output_ordering.h
+++ b/net/tools/flip_server/output_ordering.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -10,6 +10,7 @@
#include <string>
#include "base/basictypes.h"
+#include "base/compiler_specific.h"
#include "net/tools/flip_server/constants.h"
#include "net/tools/flip_server/epoll_server.h"
#include "net/tools/flip_server/mem_cache.h"
@@ -54,11 +55,11 @@ class OutputOrdering {
virtual ~BeginOutputtingAlarm();
// EpollAlarmCallbackInterface:
- virtual int64 OnAlarm();
+ virtual int64 OnAlarm() OVERRIDE;
virtual void OnRegistration(const EpollServer::AlarmRegToken& tok,
- EpollServer* eps);
- virtual void OnUnregistration();
- virtual void OnShutdown(EpollServer* eps);
+ EpollServer* eps) OVERRIDE;
+ virtual void OnUnregistration() OVERRIDE;
+ virtual void OnShutdown(EpollServer* eps) OVERRIDE;
private:
OutputOrdering* output_ordering_;
diff --git a/net/tools/flip_server/ring_buffer.h b/net/tools/flip_server/ring_buffer.h
index be4435b..eeb04cc 100644
--- a/net/tools/flip_server/ring_buffer.h
+++ b/net/tools/flip_server/ring_buffer.h
@@ -6,6 +6,7 @@
#define NET_TOOLS_FLIP_SERVER_RING_BUFFER_H__
#pragma once
+#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
#include "net/tools/flip_server/buffer_interface.h"
@@ -38,32 +39,32 @@ class RingBuffer : public BufferInterface {
// The following functions all override pure virtual functions
// in BufferInterface. See buffer_interface.h for a description
// of what they do if the function isn't documented here.
- virtual int ReadableBytes() const;
- virtual int BufferSize() const;
- virtual int BytesFree() const;
+ virtual int ReadableBytes() const OVERRIDE;
+ virtual int BufferSize() const OVERRIDE;
+ virtual int BytesFree() const OVERRIDE;
- virtual bool Empty() const;
- virtual bool Full() const;
+ virtual bool Empty() const OVERRIDE;
+ virtual bool Full() const OVERRIDE;
// returns the number of characters written.
// appends up-to-'size' bytes to the ringbuffer.
- virtual int Write(const char * bytes, int size);
+ virtual int Write(const char * bytes, int size) OVERRIDE;
// Stores a pointer into the ring buffer in *ptr, and stores the number of
// characters which are allowed to be written in *size.
// If there are no writable bytes available, then *size will contain 0.
- virtual void GetWritablePtr(char** ptr, int* size) const;
+ virtual void GetWritablePtr(char** ptr, int* size) const OVERRIDE;
// Stores a pointer into the ring buffer in *ptr, and stores the number of
// characters which are allowed to be read in *size.
// If there are no readable bytes available, then *size will contain 0.
- virtual void GetReadablePtr(char** ptr, int* size) const;
+ virtual void GetReadablePtr(char** ptr, int* size) const OVERRIDE;
// Returns the number of bytes read into 'bytes'.
- virtual int Read(char* bytes, int size);
+ virtual int Read(char* bytes, int size) OVERRIDE;
// Removes all data from the ring buffer.
- virtual void Clear();
+ virtual void Clear() OVERRIDE;
// Reserves contiguous writable empty space in the buffer of size bytes.
// Since the point of this class is to have a fixed size buffer, be careful
@@ -76,15 +77,15 @@ class RingBuffer : public BufferInterface {
// to consolidate fragmented free space. If the size requested is less than
// or equal to BytesFree(), it is guaranteed that the buffer size will not
// change.
- virtual bool Reserve(int size);
+ virtual bool Reserve(int size) OVERRIDE;
// Removes the oldest 'amount_to_advance' characters.
// If amount_to_consume > ReadableBytes(), this performs a Clear() instead.
- virtual void AdvanceReadablePtr(int amount_to_advance);
+ virtual void AdvanceReadablePtr(int amount_to_advance) OVERRIDE;
// Moves the internal pointers around such that the amount of data specified
// here is expected to already be resident (as if it was Written).
- virtual void AdvanceWritablePtr(int amount_to_advance);
+ virtual void AdvanceWritablePtr(int amount_to_advance) OVERRIDE;
protected:
int read_idx() const { return read_idx_; }
diff --git a/net/tools/flip_server/simple_buffer.h b/net/tools/flip_server/simple_buffer.h
index 831531d..f623ca2 100644
--- a/net/tools/flip_server/simple_buffer.h
+++ b/net/tools/flip_server/simple_buffer.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -8,6 +8,7 @@
#include <string>
+#include "base/compiler_specific.h"
#include "net/tools/flip_server/buffer_interface.h"
namespace net {
@@ -32,32 +33,32 @@ class SimpleBuffer : public BufferInterface {
// The following functions all override pure virtual functions
// in BufferInterface. See buffer_interface.h for a description
// of what they do.
- virtual int ReadableBytes() const;
- virtual int BufferSize() const;
- virtual int BytesFree() const;
+ virtual int ReadableBytes() const OVERRIDE;
+ virtual int BufferSize() const OVERRIDE;
+ virtual int BytesFree() const OVERRIDE;
- virtual bool Empty() const;
- virtual bool Full() const;
+ virtual bool Empty() const OVERRIDE;
+ virtual bool Full() const OVERRIDE;
- virtual int Write(const char* bytes, int size);
+ virtual int Write(const char* bytes, int size) OVERRIDE;
- virtual void GetWritablePtr(char **ptr, int* size) const;
+ virtual void GetWritablePtr(char **ptr, int* size) const OVERRIDE;
- virtual void GetReadablePtr(char **ptr, int* size) const;
+ virtual void GetReadablePtr(char **ptr, int* size) const OVERRIDE;
- virtual int Read(char* bytes, int size);
+ virtual int Read(char* bytes, int size) OVERRIDE;
- virtual void Clear();
+ virtual void Clear() OVERRIDE;
// This can be an expensive operation: costing a new/delete, and copying of
// all existing data. Even if the existing buffer does not need to be
// resized, unread data may still need to be non-destructively copied to
// consolidate fragmented free space.
- virtual bool Reserve(int size);
+ virtual bool Reserve(int size) OVERRIDE;
- virtual void AdvanceReadablePtr(int amount_to_advance);
+ virtual void AdvanceReadablePtr(int amount_to_advance) OVERRIDE;
- virtual void AdvanceWritablePtr(int amount_to_advance);
+ virtual void AdvanceWritablePtr(int amount_to_advance) OVERRIDE;
void Swap(SimpleBuffer* other) {
char* tmp = storage_;
diff --git a/net/tools/flip_server/sm_connection.h b/net/tools/flip_server/sm_connection.h
index aa91890..e7f1e99 100644
--- a/net/tools/flip_server/sm_connection.h
+++ b/net/tools/flip_server/sm_connection.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -11,6 +11,7 @@
#include <list>
#include <string>
+#include "base/compiler_specific.h"
#include "net/tools/flip_server/create_listener.h"
#include "net/tools/flip_server/epoll_server.h"
#include "net/tools/flip_server/mem_cache.h"
@@ -54,10 +55,10 @@ class SMConnection : public SMConnectionInterface,
std::string server_ip_;
std::string server_port_;
- virtual EpollServer* epoll_server();
+ virtual EpollServer* epoll_server() OVERRIDE;
OutputList* output_list() { return &output_list_; }
MemoryCache* memory_cache() { return memory_cache_; }
- virtual void ReadyToSend();
+ virtual void ReadyToSend() OVERRIDE;
void EnqueueDataFrame(DataFrame* df);
int fd() const { return fd_; }
@@ -79,14 +80,16 @@ class SMConnection : public SMConnectionInterface,
int Send(const char* data, int len, int flags);
// EpollCallbackInterface interface.
- virtual void OnRegistration(EpollServer* eps, int fd, int event_mask);
- virtual void OnModification(int fd, int event_mask) {}
- virtual void OnEvent(int fd, EpollEvent* event);
- virtual void OnUnregistration(int fd, bool replaced);
- virtual void OnShutdown(EpollServer* eps, int fd);
+ virtual void OnRegistration(EpollServer* eps,
+ int fd,
+ int event_mask) OVERRIDE;
+ virtual void OnModification(int fd, int event_mask) OVERRIDE {}
+ virtual void OnEvent(int fd, EpollEvent* event) OVERRIDE;
+ virtual void OnUnregistration(int fd, bool replaced) OVERRIDE;
+ virtual void OnShutdown(EpollServer* eps, int fd) OVERRIDE;
// NotifierInterface interface.
- virtual void Notify() {}
+ virtual void Notify() OVERRIDE {}
void Cleanup(const char* cleanup);
diff --git a/net/tools/flip_server/spdy_interface.h b/net/tools/flip_server/spdy_interface.h
index e9bedc1..d2ae89a 100644
--- a/net/tools/flip_server/spdy_interface.h
+++ b/net/tools/flip_server/spdy_interface.h
@@ -9,6 +9,7 @@
#include <string>
#include <vector>
+#include "base/compiler_specific.h"
#include "net/spdy/spdy_framer.h"
#include "net/spdy/spdy_protocol.h"
#include "net/tools/flip_server/balsa_headers.h"
@@ -33,7 +34,7 @@ class SpdySM : public spdy::SpdyFramerVisitorInterface,
virtual ~SpdySM();
virtual void InitSMInterface(SMInterface* sm_http_interface,
- int32 server_idx) {}
+ int32 server_idx) OVERRIDE {}
virtual void InitSMConnection(SMConnectionPoolInterface* connection_pool,
SMInterface* sm_interface,
@@ -42,7 +43,7 @@ class SpdySM : public spdy::SpdyFramerVisitorInterface,
std::string server_ip,
std::string server_port,
std::string remote_ip,
- bool use_ssl);
+ bool use_ssl) OVERRIDE;
static bool disable_data_compression() { return disable_data_compression_; }
static void set_disable_data_compression(bool value) {
@@ -50,8 +51,8 @@ class SpdySM : public spdy::SpdyFramerVisitorInterface,
}
private:
- virtual void set_is_request() {}
- virtual void OnError(spdy::SpdyFramer* framer) {}
+ virtual void set_is_request() OVERRIDE {}
+ virtual void OnError(spdy::SpdyFramer* framer) OVERRIDE {}
SMInterface* NewConnectionInterface();
SMInterface* FindOrMakeNewSMConnectionInterface(std::string server_ip,
std::string server_port);
@@ -60,43 +61,45 @@ class SpdySM : public spdy::SpdyFramerVisitorInterface,
bool* is_https_scheme);
// SpdyFramerVisitor interface.
- virtual void OnControl(const spdy::SpdyControlFrame* frame);
+ virtual void OnControl(const spdy::SpdyControlFrame* frame) OVERRIDE;
virtual bool OnControlFrameHeaderData(spdy::SpdyStreamId stream_id,
const char* header_data,
- size_t len);
- virtual void OnDataFrameHeader(const spdy::SpdyDataFrame* frame);
+ size_t len) OVERRIDE;
+ virtual void OnDataFrameHeader(const spdy::SpdyDataFrame* frame) OVERRIDE;
virtual void OnStreamFrameData(spdy::SpdyStreamId stream_id,
- const char* data, size_t len);
+ const char* data, size_t len) OVERRIDE;
public:
- virtual size_t ProcessReadInput(const char* data, size_t len);
- virtual size_t ProcessWriteInput(const char* data, size_t len);
- virtual bool MessageFullyRead() const;
- virtual void SetStreamID(uint32 stream_id) {}
- virtual bool Error() const;
- virtual const char* ErrorAsString() const;
- virtual void Reset() {}
- virtual void ResetForNewInterface(int32 server_idx);
- virtual void ResetForNewConnection();
+ virtual size_t ProcessReadInput(const char* data, size_t len) OVERRIDE;
+ virtual size_t ProcessWriteInput(const char* data, size_t len) OVERRIDE;
+ virtual bool MessageFullyRead() const OVERRIDE;
+ virtual void SetStreamID(uint32 stream_id) OVERRIDE {}
+ virtual bool Error() const OVERRIDE;
+ virtual const char* ErrorAsString() const OVERRIDE;
+ virtual void Reset() OVERRIDE {}
+ virtual void ResetForNewInterface(int32 server_idx) OVERRIDE;
+ virtual void ResetForNewConnection() OVERRIDE;
// SMInterface's Cleanup is currently only called by SMConnection after a
// protocol message as been fully read. Spdy's SMInterface does not need
// to do any cleanup at this time.
// TODO(klindsay) This method is probably not being used properly and
// some logic review and method renaming is probably in order.
- virtual void Cleanup() {}
+ virtual void Cleanup() OVERRIDE {}
// Send a settings frame
- virtual int PostAcceptHook();
+ virtual int PostAcceptHook() OVERRIDE;
virtual void NewStream(uint32 stream_id,
uint32 priority,
- const std::string& filename);
+ const std::string& filename) OVERRIDE;
void AddToOutputOrder(const MemCacheIter& mci);
- virtual void SendEOF(uint32 stream_id);
- virtual void SendErrorNotFound(uint32 stream_id);
+ virtual void SendEOF(uint32 stream_id) OVERRIDE;
+ virtual void SendErrorNotFound(uint32 stream_id) OVERRIDE;
void SendOKResponse(uint32 stream_id, std::string* output);
- virtual size_t SendSynStream(uint32 stream_id, const BalsaHeaders& headers);
- virtual size_t SendSynReply(uint32 stream_id, const BalsaHeaders& headers);
+ virtual size_t SendSynStream(uint32 stream_id,
+ const BalsaHeaders& headers) OVERRIDE;
+ virtual size_t SendSynReply(uint32 stream_id,
+ const BalsaHeaders& headers) OVERRIDE;
virtual void SendDataFrame(uint32 stream_id, const char* data, int64 len,
- uint32 flags, bool compress);
+ uint32 flags, bool compress) OVERRIDE;
spdy::SpdyFramer* spdy_framer() { return spdy_framer_; }
static std::string forward_ip_header() { return forward_ip_header_; }
@@ -115,7 +118,7 @@ class SpdySM : public spdy::SpdyFramerVisitorInterface,
void SendDataFrameImpl(uint32 stream_id, const char* data, int64 len,
spdy::SpdyDataFlags flags, bool compress);
void EnqueueDataFrame(DataFrame* df);
- virtual void GetOutput();
+ virtual void GetOutput() OVERRIDE;
private:
uint64 seq_num_;
spdy::SpdyFramer* spdy_framer_;
diff --git a/net/tools/flip_server/streamer_interface.h b/net/tools/flip_server/streamer_interface.h
index 97ce0e6..4f09b45 100644
--- a/net/tools/flip_server/streamer_interface.h
+++ b/net/tools/flip_server/streamer_interface.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -7,6 +7,7 @@
#include <string>
+#include "base/compiler_specific.h"
#include "net/tools/flip_server/balsa_headers.h"
#include "net/tools/flip_server/balsa_visitor_interface.h"
#include "net/tools/flip_server/sm_interface.h"
@@ -31,7 +32,7 @@ class StreamerSM : public BalsaVisitorInterface,
void AddToOutputOrder(const MemCacheIter& mci) {}
virtual void InitSMInterface(SMInterface* sm_other_interface,
- int32 server_idx);
+ int32 server_idx) OVERRIDE;
virtual void InitSMConnection(SMConnectionPoolInterface* connection_pool,
SMInterface* sm_interface,
EpollServer* epoll_server,
@@ -39,29 +40,31 @@ class StreamerSM : public BalsaVisitorInterface,
std::string server_ip,
std::string server_port,
std::string remote_ip,
- bool use_ssl);
+ bool use_ssl) OVERRIDE;
- virtual size_t ProcessReadInput(const char* data, size_t len);
- virtual size_t ProcessWriteInput(const char* data, size_t len);
- virtual bool MessageFullyRead() const;
- virtual void SetStreamID(uint32 stream_id) {}
- virtual bool Error() const;
- virtual const char* ErrorAsString() const;
- virtual void Reset();
- virtual void ResetForNewInterface(int32 server_idx) {}
- virtual void ResetForNewConnection();
- virtual void Cleanup();
- virtual int PostAcceptHook();
+ virtual size_t ProcessReadInput(const char* data, size_t len) OVERRIDE;
+ virtual size_t ProcessWriteInput(const char* data, size_t len) OVERRIDE;
+ virtual bool MessageFullyRead() const OVERRIDE;
+ virtual void SetStreamID(uint32 stream_id) OVERRIDE {}
+ virtual bool Error() const OVERRIDE;
+ virtual const char* ErrorAsString() const OVERRIDE;
+ virtual void Reset() OVERRIDE;
+ virtual void ResetForNewInterface(int32 server_idx) OVERRIDE {}
+ virtual void ResetForNewConnection() OVERRIDE;
+ virtual void Cleanup() OVERRIDE;
+ virtual int PostAcceptHook() OVERRIDE;
virtual void NewStream(uint32 stream_id, uint32 priority,
- const std::string& filename) {}
- virtual void SendEOF(uint32 stream_id) {}
- virtual void SendErrorNotFound(uint32 stream_id) {}
+ const std::string& filename) OVERRIDE {}
+ virtual void SendEOF(uint32 stream_id) OVERRIDE {}
+ virtual void SendErrorNotFound(uint32 stream_id) OVERRIDE {}
virtual void SendOKResponse(uint32 stream_id, std::string output) {}
- virtual size_t SendSynStream(uint32 stream_id, const BalsaHeaders& headers);
- virtual size_t SendSynReply(uint32 stream_id, const BalsaHeaders& headers);
+ virtual size_t SendSynStream(uint32 stream_id,
+ const BalsaHeaders& headers) OVERRIDE;
+ virtual size_t SendSynReply(uint32 stream_id,
+ const BalsaHeaders& headers) OVERRIDE;
virtual void SendDataFrame(uint32 stream_id, const char* data, int64 len,
- uint32 flags, bool compress) {}
- virtual void set_is_request();
+ uint32 flags, bool compress) OVERRIDE {}
+ virtual void set_is_request() OVERRIDE;
static std::string forward_ip_header() { return forward_ip_header_; }
static void set_forward_ip_header(std::string value) {
forward_ip_header_ = value;
@@ -79,14 +82,14 @@ class StreamerSM : public BalsaVisitorInterface,
}
void SendDataFrameImpl(uint32 stream_id, const char* data, int64 len,
uint32 flags, bool compress) {}
- virtual void GetOutput() {}
+ virtual void GetOutput() OVERRIDE {}
- virtual void ProcessBodyInput(const char *input, size_t size);
- virtual void MessageDone();
- virtual void ProcessHeaders(const BalsaHeaders& headers);
- virtual void ProcessBodyData(const char *input, size_t size) {}
- virtual void ProcessHeaderInput(const char *input, size_t size) {}
- virtual void ProcessTrailerInput(const char *input, size_t size) {}
+ virtual void ProcessBodyInput(const char *input, size_t size) OVERRIDE;
+ virtual void MessageDone() OVERRIDE;
+ virtual void ProcessHeaders(const BalsaHeaders& headers) OVERRIDE;
+ virtual void ProcessBodyData(const char *input, size_t size) OVERRIDE {}
+ virtual void ProcessHeaderInput(const char *input, size_t size) OVERRIDE {}
+ virtual void ProcessTrailerInput(const char *input, size_t size) OVERRIDE {}
virtual void ProcessRequestFirstLine(const char* line_input,
size_t line_length,
const char* method_input,
@@ -94,7 +97,7 @@ class StreamerSM : public BalsaVisitorInterface,
const char* request_uri_input,
size_t request_uri_length,
const char* version_input,
- size_t version_length) {}
+ size_t version_length) OVERRIDE {}
virtual void ProcessResponseFirstLine(const char *line_input,
size_t line_length,
const char *version_input,
@@ -102,14 +105,15 @@ class StreamerSM : public BalsaVisitorInterface,
const char *status_input,
size_t status_length,
const char *reason_input,
- size_t reason_length) {}
- virtual void ProcessChunkLength(size_t chunk_length) {}
- virtual void ProcessChunkExtensions(const char *input, size_t size) {}
- virtual void HeaderDone() {}
- virtual void HandleHeaderError(BalsaFrame* framer);
- virtual void HandleHeaderWarning(BalsaFrame* framer) {}
- virtual void HandleChunkingError(BalsaFrame* framer);
- virtual void HandleBodyError(BalsaFrame* framer);
+ size_t reason_length) OVERRIDE {}
+ virtual void ProcessChunkLength(size_t chunk_length) OVERRIDE {}
+ virtual void ProcessChunkExtensions(const char *input,
+ size_t size) OVERRIDE {}
+ virtual void HeaderDone() OVERRIDE {}
+ virtual void HandleHeaderError(BalsaFrame* framer) OVERRIDE;
+ virtual void HandleHeaderWarning(BalsaFrame* framer) OVERRIDE {}
+ virtual void HandleChunkingError(BalsaFrame* framer) OVERRIDE;
+ virtual void HandleBodyError(BalsaFrame* framer) OVERRIDE;
void HandleError();
SMConnection* connection_;
generated by cgit v1.1 at 2025-03-18 13:30:07 +0000