14665ff7d4
Clang version changed 223108:230914
Details: e144d30..6fdb142/tools/clang/scripts/update.sh
Removes the OVERRIDE macro defined in:
* webrtc/base/common.h
* webrtc/typedefs.h
The majority of the source changes were done by running this in src/:
perl -0pi -e "s/virtual\s([^({;]*(\([^({;]*\)[^({;]*))(OVERRIDE|override)/\1override/sg" `find {talk,webrtc} -name "*.h" -o -name "*.cc*" -o -name "*.mm*"`
which converted all:
virtual Foo() OVERRIDE
functions to:
Foo() override
Then I manually edited:
* talk/media/webrtc/fakewebrtccommon.h
* webrtc/test/fake_common.h
Remaining uses of OVERRIDE was fixed by search+replace.
Manual edits were done to fix virtual destructors that were
overriding inherited ones.
Finally a build error related to the pure virtual definitions of
Read, Write and Rewind in common_types.h required a bit of
refactoring in:
* webrtc/common_types.cc
* webrtc/common_types.h
* webrtc/system_wrappers/interface/file_wrapper.h
* webrtc/system_wrappers/source/file_impl.cc
This roll should make it possible for us to finally re-enable deadlock
detection for TSan on the buildbots.
BUG=4106
R=pbos@webrtc.org, tommi@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/41069004
Cr-Commit-Position: refs/heads/master@{#8596}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8596 4adac7df-926f-26a2-2b94-8c16560cd09d
79 lines
2.8 KiB
C++
79 lines
2.8 KiB
C++
/*
|
|
* Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#ifndef WEBRTC_SYSTEM_WRAPPERS_INTERFACE_FILE_WRAPPER_H_
|
|
#define WEBRTC_SYSTEM_WRAPPERS_INTERFACE_FILE_WRAPPER_H_
|
|
|
|
#include <stddef.h>
|
|
#include <stdio.h>
|
|
|
|
#include "webrtc/common_types.h"
|
|
#include "webrtc/typedefs.h"
|
|
|
|
// Implementation of an InStream and OutStream that can read (exclusive) or
|
|
// write from/to a file.
|
|
|
|
namespace webrtc {
|
|
|
|
class FileWrapper : public InStream, public OutStream {
|
|
public:
|
|
static const size_t kMaxFileNameSize = 1024;
|
|
|
|
// Factory method. Constructor disabled.
|
|
static FileWrapper* Create();
|
|
|
|
// Returns true if a file has been opened.
|
|
virtual bool Open() const = 0;
|
|
|
|
// Opens a file in read or write mode, decided by the read_only parameter.
|
|
virtual int OpenFile(const char* file_name_utf8,
|
|
bool read_only,
|
|
bool loop = false,
|
|
bool text = false) = 0;
|
|
|
|
// Initializes the wrapper from an existing handle. |read_only| must match in
|
|
// the mode the file was opened in. If |manage_file| is true, the wrapper
|
|
// takes ownership of |handle| and closes it in CloseFile().
|
|
virtual int OpenFromFileHandle(FILE* handle,
|
|
bool manage_file,
|
|
bool read_only,
|
|
bool loop = false) = 0;
|
|
|
|
virtual int CloseFile() = 0;
|
|
|
|
// Limits the file size to |bytes|. Writing will fail after the cap
|
|
// is hit. Pass zero to use an unlimited size.
|
|
virtual int SetMaxFileSize(size_t bytes) = 0;
|
|
|
|
// Flush any pending writes.
|
|
virtual int Flush() = 0;
|
|
|
|
// Returns the opened file's name in |file_name_utf8|. Provide the size of
|
|
// the buffer in bytes in |size|. The name will be truncated if |size| is
|
|
// too small.
|
|
virtual int FileName(char* file_name_utf8,
|
|
size_t size) const = 0;
|
|
|
|
// Write |format| to the opened file. Arguments are taken in the same manner
|
|
// as printf. That is, supply a format string containing text and
|
|
// specifiers. Returns the number of characters written or -1 on error.
|
|
virtual int WriteText(const char* format, ...) = 0;
|
|
|
|
// Inherited from both Instream and OutStream.
|
|
// Rewinds the file to the start. Only available when OpenFile() has been
|
|
// called with |loop| == true or |readOnly| == true.
|
|
// virtual int Rewind() = 0;
|
|
int Rewind() override;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_SYSTEM_WRAPPERS_INTERFACE_FILE_WRAPPER_H_
|