Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (95399 => 95400)
--- trunk/Source/_javascript_Core/ChangeLog 2011-09-18 22:29:41 UTC (rev 95399)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-09-19 01:29:10 UTC (rev 95400)
@@ -1,3 +1,17 @@
+2011-09-18 Dan Bernstein <[email protected]>
+
+ Removed ProfilerServer.
+
+ Reviewed by Mark Rowe.
+
+ * _javascript_Core.gypi:
+ * _javascript_Core.xcodeproj/project.pbxproj:
+ * profiler/ProfilerServer.h: Removed.
+ * profiler/ProfilerServer.mm: Removed.
+ * runtime/JSGlobalData.cpp:
+ (JSC::JSGlobalData::JSGlobalData):
+ * wscript:
+
2011-09-17 Filip Pizlo <[email protected]>
DFG JIT should inline Math.min, Math.max, and Math.sqrt
Modified: trunk/Source/_javascript_Core/_javascript_Core.gypi (95399 => 95400)
--- trunk/Source/_javascript_Core/_javascript_Core.gypi 2011-09-18 22:29:41 UTC (rev 95399)
+++ trunk/Source/_javascript_Core/_javascript_Core.gypi 2011-09-19 01:29:10 UTC (rev 95400)
@@ -430,8 +430,6 @@
'profiler/ProfileGenerator.h',
'profiler/ProfileNode.cpp',
'profiler/Profiler.cpp',
- 'profiler/ProfilerServer.h',
- 'profiler/ProfilerServer.mm',
'qt/api/qscriptconverter_p.h',
'qt/api/qscriptengine.cpp',
'qt/api/qscriptengine.h',
Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (95399 => 95400)
--- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2011-09-18 22:29:41 UTC (rev 95399)
+++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2011-09-19 01:29:10 UTC (rev 95400)
@@ -228,8 +228,6 @@
18BAB55410DAE066000D945B /* ThreadIdentifierDataPthreads.h in Headers */ = {isa = PBXBuildFile; fileRef = 18BAB52810DADFCD000D945B /* ThreadIdentifierDataPthreads.h */; };
1A082779142168D70090CCAC /* BinarySemaphore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A082777142168D70090CCAC /* BinarySemaphore.cpp */; };
1A08277A142168D70090CCAC /* BinarySemaphore.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A082778142168D70090CCAC /* BinarySemaphore.h */; };
- 1C61516C0EBAC7A00031376F /* ProfilerServer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1C61516A0EBAC7A00031376F /* ProfilerServer.mm */; settings = {COMPILER_FLAGS = "-fno-strict-aliasing"; }; };
- 1C61516D0EBAC7A00031376F /* ProfilerServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C61516B0EBAC7A00031376F /* ProfilerServer.h */; };
2CFC5D1E12F45B48004914E2 /* CharacterNames.h in Headers */ = {isa = PBXBuildFile; fileRef = 2CFC5B7A12F44714004914E2 /* CharacterNames.h */; settings = {ATTRIBUTES = (Private, ); }; };
41359CF30FDD89AD00206180 /* DateConversion.h in Headers */ = {isa = PBXBuildFile; fileRef = D21202290AD4310C00ED79B6 /* DateConversion.h */; };
41359CF60FDD89CB00206180 /* DateMath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41359CF40FDD89CB00206180 /* DateMath.cpp */; };
@@ -926,8 +924,6 @@
18BAB52810DADFCD000D945B /* ThreadIdentifierDataPthreads.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadIdentifierDataPthreads.h; sourceTree = "<group>"; };
1A082777142168D70090CCAC /* BinarySemaphore.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BinarySemaphore.cpp; sourceTree = "<group>"; };
1A082778142168D70090CCAC /* BinarySemaphore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BinarySemaphore.h; sourceTree = "<group>"; };
- 1C61516A0EBAC7A00031376F /* ProfilerServer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ProfilerServer.mm; path = profiler/ProfilerServer.mm; sourceTree = "<group>"; };
- 1C61516B0EBAC7A00031376F /* ProfilerServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ProfilerServer.h; path = profiler/ProfilerServer.h; sourceTree = "<group>"; };
1C9051420BA9E8A70081E9D0 /* Version.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Version.xcconfig; sourceTree = "<group>"; };
1C9051430BA9E8A70081E9D0 /* _javascript_Core.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = _javascript_Core.xcconfig; sourceTree = "<group>"; };
1C9051440BA9E8A70081E9D0 /* DebugRelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DebugRelease.xcconfig; sourceTree = "<group>"; };
@@ -2279,8 +2275,6 @@
95AB83550DA43B4400BC83F3 /* ProfileNode.h */,
95AB832E0DA42CAD00BC83F3 /* Profiler.cpp */,
95AB832F0DA42CAD00BC83F3 /* Profiler.h */,
- 1C61516B0EBAC7A00031376F /* ProfilerServer.h */,
- 1C61516A0EBAC7A00031376F /* ProfilerServer.mm */,
);
name = profiler;
sourceTree = "<group>";
@@ -2656,7 +2650,6 @@
95CD45770E1C4FDD0085358E /* ProfileGenerator.h in Headers */,
BC18C4510E16F5CD00B34460 /* ProfileNode.h in Headers */,
BC18C4520E16F5CD00B34460 /* Profiler.h in Headers */,
- 1C61516D0EBAC7A00031376F /* ProfilerServer.h in Headers */,
A7FB61001040C38B0017A286 /* PropertyDescriptor.h in Headers */,
BC95437D0EBA70FD0072B6D3 /* PropertyMapHashTable.h in Headers */,
BC18C4540E16F5CD00B34460 /* PropertyNameArray.h in Headers */,
@@ -3244,7 +3237,6 @@
95CD45760E1C4FDD0085358E /* ProfileGenerator.cpp in Sources */,
95AB83560DA43C3000BC83F3 /* ProfileNode.cpp in Sources */,
95AB83420DA4322500BC83F3 /* Profiler.cpp in Sources */,
- 1C61516C0EBAC7A00031376F /* ProfilerServer.mm in Sources */,
A7FB60A4103F7DC20017A286 /* PropertyDescriptor.cpp in Sources */,
14469DE7107EC7E700650446 /* PropertyNameArray.cpp in Sources */,
14469DE8107EC7E700650446 /* PropertySlot.cpp in Sources */,
Deleted: trunk/Source/_javascript_Core/profiler/ProfilerServer.h (95399 => 95400)
--- trunk/Source/_javascript_Core/profiler/ProfilerServer.h 2011-09-18 22:29:41 UTC (rev 95399)
+++ trunk/Source/_javascript_Core/profiler/ProfilerServer.h 2011-09-19 01:29:10 UTC (rev 95400)
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef ProfileServer_h
-#define ProfileServer_h
-
-namespace JSC {
-
-void startProfilerServerIfNeeded();
-
-} // namespace JSC
-
-#endif // ProfileServer_h
Deleted: trunk/Source/_javascript_Core/profiler/ProfilerServer.mm (95399 => 95400)
--- trunk/Source/_javascript_Core/profiler/ProfilerServer.mm 2011-09-18 22:29:41 UTC (rev 95399)
+++ trunk/Source/_javascript_Core/profiler/ProfilerServer.mm 2011-09-19 01:29:10 UTC (rev 95400)
@@ -1,115 +0,0 @@
-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "config.h"
-#import "ProfilerServer.h"
-
-#import "JSProfilerPrivate.h"
-#import "JSRetainPtr.h"
-#import <Foundation/Foundation.h>
-
-#if PLATFORM(IOS_SIMULATOR)
-#import <Foundation/NSDistributedNotificationCenter.h>
-#endif
-
-@interface ProfilerServer : NSObject {
-@private
- NSString *_serverName;
- unsigned _listenerCount;
-}
-+ (ProfilerServer *)sharedProfileServer;
-- (void)startProfiling;
-- (void)stopProfiling;
-@end
-
-@implementation ProfilerServer
-
-+ (ProfilerServer *)sharedProfileServer
-{
- static ProfilerServer *sharedServer;
- if (!sharedServer)
- sharedServer = [[ProfilerServer alloc] init];
- return sharedServer;
-}
-
-- (id)init
-{
- if (!(self = [super init]))
- return nil;
-
- NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-
- NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
- if ([defaults boolForKey:@"EnableJSProfiling"])
- [self startProfiling];
-
-#if !PLATFORM(IOS) || PLATFORM(IOS_SIMULATOR)
- // FIXME: <rdar://problem/6546135>
- // The catch-all notifications
- [[NSDistributedNotificationCenter defaultCenter] addObserver:self selector:@selector(startProfiling) name:@"ProfilerServerStartNotification" object:nil];
- [[NSDistributedNotificationCenter defaultCenter] addObserver:self selector:@selector(stopProfiling) name:@"ProfilerServerStopNotification" object:nil];
-#endif
-
- // The specific notifications
- NSProcessInfo *processInfo = [NSProcessInfo processInfo];
- _serverName = [[NSString alloc] initWithFormat:@"ProfilerServer-%d", [processInfo processIdentifier]];
-
-#if !PLATFORM(IOS) || PLATFORM(IOS_SIMULATOR)
- // FIXME: <rdar://problem/6546135>
- [[NSDistributedNotificationCenter defaultCenter] addObserver:self selector:@selector(startProfiling) name:[_serverName stringByAppendingString:@"-Start"] object:nil];
- [[NSDistributedNotificationCenter defaultCenter] addObserver:self selector:@selector(stopProfiling) name:[_serverName stringByAppendingString:@"-Stop"] object:nil];
-#endif
-
- [pool drain];
-
- return self;
-}
-
-- (void)startProfiling
-{
- if (++_listenerCount > 1)
- return;
- JSRetainPtr<JSStringRef> profileName(Adopt, JSStringCreateWithUTF8CString([_serverName UTF8String]));
- JSStartProfiling(0, profileName.get());
-}
-
-- (void)stopProfiling
-{
- if (!_listenerCount || --_listenerCount > 0)
- return;
- JSRetainPtr<JSStringRef> profileName(Adopt, JSStringCreateWithUTF8CString([_serverName UTF8String]));
- JSEndProfiling(0, profileName.get());
-}
-
-@end
-
-namespace JSC {
-
-void startProfilerServerIfNeeded()
-{
- [ProfilerServer sharedProfileServer];
-}
-
-} // namespace JSC
Modified: trunk/Source/_javascript_Core/runtime/JSGlobalData.cpp (95399 => 95400)
--- trunk/Source/_javascript_Core/runtime/JSGlobalData.cpp 2011-09-18 22:29:41 UTC (rev 95399)
+++ trunk/Source/_javascript_Core/runtime/JSGlobalData.cpp 2011-09-19 01:29:10 UTC (rev 95400)
@@ -64,7 +64,6 @@
#endif
#if PLATFORM(MAC)
-#include "ProfilerServer.h"
#include <CoreFoundation/CoreFoundation.h>
#endif
@@ -238,9 +237,6 @@
wtfThreadData().setCurrentIdentifierTable(existingEntryIdentifierTable);
-#if PLATFORM(MAC)
- startProfilerServerIfNeeded();
-#endif
#if ENABLE(JIT) && ENABLE(INTERPRETER)
#if USE(CF)
CFStringRef canUseJITKey = CFStringCreateWithCString(0 , "_javascript_CoreUseJIT", kCFStringEncodingMacRoman);
Modified: trunk/Source/_javascript_Core/wscript (95399 => 95400)
--- trunk/Source/_javascript_Core/wscript 2011-09-18 22:29:41 UTC (rev 95399)
+++ trunk/Source/_javascript_Core/wscript 2011-09-19 01:29:10 UTC (rev 95400)
@@ -33,7 +33,7 @@
import Options
- jscore_excludes = ['jsc.cpp', 'ProfilerServer.mm', 'ExecutableAllocatorPosix.cpp']
+ jscore_excludes = ['jsc.cpp', 'ExecutableAllocatorPosix.cpp']
jscore_excludes.extend(get_excludes(jscore_dir, ['*Brew.cpp', '*CF.cpp', '*Symbian.cpp']))
jscore_excludes.extend(get_excludes(jscore_dir, ['*None.cpp']))
