| Index: courgette/memory_allocator.cc
|
| ===================================================================
|
| --- courgette/memory_allocator.cc (revision 80344)
|
| +++ courgette/memory_allocator.cc (working copy)
|
| @@ -11,46 +11,30 @@
|
|
|
| #ifdef OS_WIN
|
|
|
| -// A helper function to help diagnose failures we've seen in the field.
|
| -// The function constructs a string containing the error and throws a runtime
|
| -// exception. The calling convention is set to stdcall to force argument
|
| -// passing via the stack.
|
| -__declspec(noinline)
|
| -void __stdcall RuntimeError(DWORD err) {
|
| - char buffer[20] = {0};
|
| - wsprintfA(buffer, "err: %u", err);
|
| - throw buffer;
|
| -}
|
| -
|
| namespace courgette {
|
|
|
| // TempFile
|
|
|
| -TempFile::TempFile() : file_(base::kInvalidPlatformFileValue), size_(0) {
|
| +TempFile::TempFile() : file_(base::kInvalidPlatformFileValue) {
|
| }
|
|
|
| TempFile::~TempFile() {
|
| Close();
|
| }
|
|
|
| -FilePath TempFile::PrepareTempFile() {
|
| - FilePath path;
|
| - if (!file_util::CreateTemporaryFile(&path))
|
| - RuntimeError(::GetLastError());
|
| - return path;
|
| -}
|
| -
|
| void TempFile::Close() {
|
| if (valid()) {
|
| base::ClosePlatformFile(file_);
|
| file_ = base::kInvalidPlatformFileValue;
|
| - size_ = 0;
|
| }
|
| }
|
|
|
| -void TempFile::Create() {
|
| +bool TempFile::Create() {
|
| DCHECK(file_ == base::kInvalidPlatformFileValue);
|
| - FilePath path(PrepareTempFile());
|
| + FilePath path;
|
| + if (!file_util::CreateTemporaryFile(&path))
|
| + return false;
|
| +
|
| bool created = false;
|
| base::PlatformFileError error_code = base::PLATFORM_FILE_OK;
|
| int flags = base::PLATFORM_FILE_OPEN_ALWAYS | base::PLATFORM_FILE_READ |
|
| @@ -59,7 +43,9 @@
|
| base::PLATFORM_FILE_TEMPORARY;
|
| file_ = base::CreatePlatformFile(path, flags, &created, &error_code);
|
| if (file_ == base::kInvalidPlatformFileValue)
|
| - RuntimeError(error_code);
|
| + return false;
|
| +
|
| + return true;
|
| }
|
|
|
| bool TempFile::valid() const {
|
| @@ -70,17 +56,10 @@
|
| return file_;
|
| }
|
|
|
| -size_t TempFile::size() const {
|
| - return size_;
|
| +bool TempFile::SetSize(size_t size) {
|
| + return base::TruncatePlatformFile(file_, size);
|
| }
|
|
|
| -void TempFile::SetSize(size_t size) {
|
| - bool set = base::TruncatePlatformFile(file_, size);
|
| - if (!set)
|
| - RuntimeError(::GetLastError());
|
| - size_ = size;
|
| -}
|
| -
|
| // FileMapping
|
|
|
| FileMapping::FileMapping() : mapping_(NULL), view_(NULL) {
|
| @@ -90,22 +69,25 @@
|
| Close();
|
| }
|
|
|
| -void FileMapping::InitializeView(size_t size) {
|
| +bool FileMapping::InitializeView(size_t size) {
|
| DCHECK(view_ == NULL);
|
| DCHECK(mapping_ != NULL);
|
| view_ = ::MapViewOfFile(mapping_, FILE_MAP_WRITE, 0, 0, size);
|
| - if (!view_)
|
| - RuntimeError(::GetLastError());
|
| + if (!view_) {
|
| + Close();
|
| + return false;
|
| + }
|
| + return true;
|
| }
|
|
|
| -void FileMapping::Create(HANDLE file, size_t size) {
|
| +bool FileMapping::Create(HANDLE file, size_t size) {
|
| DCHECK(file != INVALID_HANDLE_VALUE);
|
| DCHECK(!valid());
|
| mapping_ = ::CreateFileMapping(file, NULL, PAGE_READWRITE, 0, 0, NULL);
|
| if (!mapping_)
|
| - RuntimeError(::GetLastError());
|
| + return false;
|
|
|
| - InitializeView(size);
|
| + return InitializeView(size);
|
| }
|
|
|
| void FileMapping::Close() {
|
| @@ -133,17 +115,22 @@
|
| TempMapping::~TempMapping() {
|
| }
|
|
|
| -void TempMapping::Initialize(size_t size) {
|
| +bool TempMapping::Initialize(size_t size) {
|
| // TODO(tommi): The assumption here is that the alignment of pointers (this)
|
| // is as strict or stricter than the alignment of the element type. This is
|
| // not always true, e.g. __m128 has 16-byte alignment.
|
| size += sizeof(this);
|
| - file_.Create();
|
| - file_.SetSize(size);
|
| - mapping_.Create(file_.handle(), size);
|
| + if (!file_.Create() ||
|
| + !file_.SetSize(size) ||
|
| + !mapping_.Create(file_.handle(), size)) {
|
| + file_.Close();
|
| + return false;
|
| + }
|
|
|
| TempMapping** write = reinterpret_cast<TempMapping**>(mapping_.view());
|
| write[0] = this;
|
| +
|
| + return true;
|
| }
|
|
|
| void* TempMapping::memory() const {
|
| @@ -154,6 +141,10 @@
|
| return mem;
|
| }
|
|
|
| +bool TempMapping::valid() const {
|
| + return mapping_.valid();
|
| +}
|
| +
|
| // static
|
| TempMapping* TempMapping::GetMappingFromPtr(void* mem) {
|
| TempMapping* ret = NULL;
|
|
|