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

Side by Side Diff: src/platform-linux.cc

Issue 11607: Remove use of strtoll in favor of strtol which should be supported on... (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 12 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2006-2008 the V8 project authors. All rights reserved. 1 // Copyright 2006-2008 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 mmap(0, size, PROT_READ | PROT_WRITE, MAP_SHARED, fileno(file), 0); 302 mmap(0, size, PROT_READ | PROT_WRITE, MAP_SHARED, fileno(file), 0);
303 return new PosixMemoryMappedFile(file, memory, size); 303 return new PosixMemoryMappedFile(file, memory, size);
304 } 304 }
305 305
306 306
307 PosixMemoryMappedFile::~PosixMemoryMappedFile() { 307 PosixMemoryMappedFile::~PosixMemoryMappedFile() {
308 if (memory_) munmap(memory_, size_); 308 if (memory_) munmap(memory_, size_);
309 fclose(file_); 309 fclose(file_);
310 } 310 }
311 311
312
312 #ifdef ENABLE_LOGGING_AND_PROFILING 313 #ifdef ENABLE_LOGGING_AND_PROFILING
313 static unsigned StringToLongLong(char* buffer) { 314 static unsigned StringToLong(char* buffer) {
314 return static_cast<unsigned>(strtoll(buffer, NULL, 16)); // NOLINT 315 return static_cast<unsigned>(strtol(buffer, NULL, 16)); // NOLINT
315 } 316 }
317 #endif
316 318
317 #endif
318 319
319 void OS::LogSharedLibraryAddresses() { 320 void OS::LogSharedLibraryAddresses() {
320 #ifdef ENABLE_LOGGING_AND_PROFILING 321 #ifdef ENABLE_LOGGING_AND_PROFILING
321 static const int MAP_LENGTH = 1024; 322 static const int MAP_LENGTH = 1024;
322 int fd = open("/proc/self/maps", O_RDONLY); 323 int fd = open("/proc/self/maps", O_RDONLY);
323 if (fd < 0) return; 324 if (fd < 0) return;
324 while (true) { 325 while (true) {
325 char addr_buffer[11]; 326 char addr_buffer[11];
326 addr_buffer[0] = '0'; 327 addr_buffer[0] = '0';
327 addr_buffer[1] = 'x'; 328 addr_buffer[1] = 'x';
328 addr_buffer[10] = 0; 329 addr_buffer[10] = 0;
329 int result = read(fd, addr_buffer + 2, 8); 330 int result = read(fd, addr_buffer + 2, 8);
330 if (result < 8) break; 331 if (result < 8) break;
331 unsigned start = StringToLongLong(addr_buffer); 332 unsigned start = StringToLong(addr_buffer);
332 result = read(fd, addr_buffer + 2, 1); 333 result = read(fd, addr_buffer + 2, 1);
333 if (result < 1) break; 334 if (result < 1) break;
334 if (addr_buffer[2] != '-') break; 335 if (addr_buffer[2] != '-') break;
335 result = read(fd, addr_buffer + 2, 8); 336 result = read(fd, addr_buffer + 2, 8);
336 if (result < 8) break; 337 if (result < 8) break;
337 unsigned end = StringToLongLong(addr_buffer); 338 unsigned end = StringToLong(addr_buffer);
338 char buffer[MAP_LENGTH]; 339 char buffer[MAP_LENGTH];
339 int bytes_read = -1; 340 int bytes_read = -1;
340 do { 341 do {
341 bytes_read++; 342 bytes_read++;
342 if (bytes_read >= MAP_LENGTH - 1) 343 if (bytes_read >= MAP_LENGTH - 1)
343 break; 344 break;
344 result = read(fd, buffer + bytes_read, 1); 345 result = read(fd, buffer + bytes_read, 1);
345 if (result < 1) break; 346 if (result < 1) break;
346 } while (buffer[bytes_read] != '\n'); 347 } while (buffer[bytes_read] != '\n');
347 buffer[bytes_read] = 0; 348 buffer[bytes_read] = 0;
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after
688 } 689 }
689 690
690 // This sampler is no longer the active sampler. 691 // This sampler is no longer the active sampler.
691 active_sampler_ = NULL; 692 active_sampler_ = NULL;
692 active_ = false; 693 active_ = false;
693 } 694 }
694 695
695 #endif // ENABLE_LOGGING_AND_PROFILING 696 #endif // ENABLE_LOGGING_AND_PROFILING
696 697
697 } } // namespace v8::internal 698 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698