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

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

Issue 6001012: Avoid using std::string in Max OS platform file. (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 9 years, 11 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:
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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 #include <mach/semaphore.h> 45 #include <mach/semaphore.h>
46 #include <mach/task.h> 46 #include <mach/task.h>
47 #include <mach/vm_statistics.h> 47 #include <mach/vm_statistics.h>
48 #include <sys/time.h> 48 #include <sys/time.h>
49 #include <sys/resource.h> 49 #include <sys/resource.h>
50 #include <sys/types.h> 50 #include <sys/types.h>
51 #include <stdarg.h> 51 #include <stdarg.h>
52 #include <stdlib.h> 52 #include <stdlib.h>
53 #include <errno.h> 53 #include <errno.h>
54 54
55 #include <string>
56
57 #undef MAP_TYPE 55 #undef MAP_TYPE
58 56
59 #include "v8.h" 57 #include "v8.h"
60 58
61 #include "platform.h" 59 #include "platform.h"
62 #include "vm-state-inl.h" 60 #include "vm-state-inl.h"
63 61
64 // Manually define these here as weak imports, rather than including execinfo.h. 62 // Manually define these here as weak imports, rather than including execinfo.h.
65 // This lets us launch on 10.4 which does not have these calls. 63 // This lets us launch on 10.4 which does not have these calls.
66 extern "C" { 64 extern "C" {
(...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after
430 static void SetThreadName(const char* name) { 428 static void SetThreadName(const char* name) {
431 // pthread_setname_np is only available in 10.6 or later, so test 429 // pthread_setname_np is only available in 10.6 or later, so test
432 // for it at runtime. 430 // for it at runtime.
433 int (*dynamic_pthread_setname_np)(const char*); 431 int (*dynamic_pthread_setname_np)(const char*);
434 *reinterpret_cast<void**>(&dynamic_pthread_setname_np) = 432 *reinterpret_cast<void**>(&dynamic_pthread_setname_np) =
435 dlsym(RTLD_DEFAULT, "pthread_setname_np"); 433 dlsym(RTLD_DEFAULT, "pthread_setname_np");
436 if (!dynamic_pthread_setname_np) 434 if (!dynamic_pthread_setname_np)
437 return; 435 return;
438 436
439 // Mac OS X does not expose the length limit of the name, so hardcode it. 437 // Mac OS X does not expose the length limit of the name, so hardcode it.
440 const int kMaxNameLength = 63; 438 static const int kMaxNameLength = 63;
441 std::string shortened_name = std::string(name).substr(0, kMaxNameLength); 439 USE(kMaxNameLength);
442 dynamic_pthread_setname_np(shortened_name.c_str()); 440 ASSERT(kMaxThreadNameLength <= kMaxNameLength);
441 dynamic_pthread_setname_np(name);
443 } 442 }
444 443
445 444
446 static void* ThreadEntry(void* arg) { 445 static void* ThreadEntry(void* arg) {
447 Thread* thread = reinterpret_cast<Thread*>(arg); 446 Thread* thread = reinterpret_cast<Thread*>(arg);
448 // This is also initialized by the first argument to pthread_create() but we 447 // This is also initialized by the first argument to pthread_create() but we
449 // don't know which thread will run first (the original thread or the new 448 // don't know which thread will run first (the original thread or the new
450 // one) so we initialize it here too. 449 // one) so we initialize it here too.
451 thread->thread_handle_data()->thread_ = pthread_self(); 450 thread->thread_handle_data()->thread_ = pthread_self();
452 SetThreadName(thread->name()); 451 SetThreadName(thread->name());
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
710 Top::WakeUpRuntimeProfilerThreadBeforeShutdown(); 709 Top::WakeUpRuntimeProfilerThreadBeforeShutdown();
711 pthread_join(data_->sampler_thread_, NULL); 710 pthread_join(data_->sampler_thread_, NULL);
712 711
713 // Deallocate Mach port for thread. 712 // Deallocate Mach port for thread.
714 mach_port_deallocate(data_->task_self_, data_->profiled_thread_); 713 mach_port_deallocate(data_->task_self_, data_->profiled_thread_);
715 } 714 }
716 715
717 #endif // ENABLE_LOGGING_AND_PROFILING 716 #endif // ENABLE_LOGGING_AND_PROFILING
718 717
719 } } // namespace v8::internal 718 } } // 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