Changeset 3375

Timestamp:

12/24/05 01:10:24 (3 years ago)

Author:

morris

Message:

3.4 times performance boost on tmon load

Files:

• Tuna/trunk/English.lproj/ReleaseNotes.rtf (modified) (2 diffs)
• Tuna/trunk/TNNode.h (modified) (1 diff)
• Tuna/trunk/TNNode.m (modified) (5 diffs)
• Tuna/trunk/TNParser.h (modified) (1 diff)
• Tuna/trunk/TNParser.m (modified) (7 diffs)
• Tuna/trunk/TNProfilerController.m (modified) (1 diff)

Tuna/trunk/English.lproj/ReleaseNotes.rtf

@@ -1 @@
-10
+23
-{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;}
-{\colortbl;\red255\green255\blue255;\red50\green100\blue255;\red227\green211\blue34;}
@@ -27 +27 @@
-\cf2 1.0.1
-\f1\b0 \cf0 \
+- Performance improvements for opening profiles\
-- Use proper "\'b5s" time unit\
-\

Tuna/trunk/TNNode.h

@@ -52 +52 @@
-- (TNNode *)childAtIndex:(unsigned int)index;
-- (TNNode *)lastChild;
-unsigned int)indexOfC
+TNNode *)c
-- (TNNode *)parent;
-- (BOOL)isLeaf;

Tuna/trunk/TNNode.m

@@ -41 +41 @@
-
-
-
-@implementation TNNode
-
@@ -168 +167 @@
-#pragma mark -
-
-childN
+n
-        if(!_children)
-
-
-
+
+
+
+
+
+
+
-        _leaf = NO;
-}
@@ -196 +199 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        
-SNotFound
+ULL
-}
-
@@ -257 +265 @@
-- (void)joinWithNode:(TNNode *)node {
-        TNNode                  *child;
-, index
+
-
-        _calls++;
@@ -269 +277 @@
-        for(i = 0; i < count; i++) {
-                child = [node->_children objectAtIndex:i];
-
-
-
+
+
+
+
+
-                        [self addChild:child];
-                else
-                        [[_children objectAtIndex:index] joinWithNode:child];
-        }
-}

Tuna/trunk/TNParser.h

@@ -32 +32 @@
-        NSString                                        *_string;
-
-NSMutableDictionary                    *_sub
-NSMutableArray                         *_node
+CFMutableArrayRef                      _node
+CFMutableDictionaryRef         _sub
-        
-        NSArray                                         *_colors;

Tuna/trunk/TNParser.m

@@ -34 +34 @@
-@interface TNParser(Private)
-
-
+_
-        TNParserStateHeader,
-        TNParserStateData,
-        TNParserStateFinished,
-};
-
-
-
-
-
-
-
+_
+
+
+_
+
+_
+_
-
-@end
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-        self = [super init];
-        
-        _string         = [string retain];
-
-subs          = [[NSMutableDictionary alloc] initWithCapacity:1000]
-nodes         = [[NSMutableArray alloc] initWithCapacity:500]
+nodes         = CFArrayCreateMutable(NULL, 0, &kCFTypeArrayCallBacks)
+subs          = CFDictionaryCreateMutable(NULL, 0, NULL, &kCFTypeDictionaryValueCallBacks)
-
-        _usedColors     = [[NSMutableDictionary alloc] initWithCapacity:50];
@@ -95 +82 @@
-
-
-- (void)dealloc {
-        [_string release];
-        
-        [_subs release];
-        [_nodes release];
-        
-        [_usedColors release];
-        
-        [_colors release];
-        
-        [super dealloc];
-}
-
-
-
-#pragma mark -
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        TNTree                  *tree;
-        TNNode                  *node, *parentNode, *rootNode;
+        TNSub                   *sub;
-        TNParserState   state;
-
+
+
+
+
-        double                  secondsPerTick;
-
-
+
+
+
-        tree                    = [[TNTree alloc] init];
-        rootNode                = [tree rootNode];
-        parentNode              = rootNode;
-        state                   = TNParserStateHeader;
-        offset                  = 0;
-        length                  = [_string length];
+        stringRange             = CFRangeMake(0, length);
-        secondsPerTick  = 0.0;
-        
-
-
+
+
+
+
+
-                
-range.location == NSNotFound
-break
+lineRange.length == 0
+continue
-                
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                // --- comment
-                                continue;
-                        }
-[line hasPrefix:@"$"]
+prefix == '$'
-                                NSScanner       *scanner;
-
+line, *
-                                
-                                // --- variables in header
+                                line = [_string substringWithRange:lineRange];
-                                scanner = [NSScanner scannerWithString:line];
-                                
@@ -169 +290 @@
-                                }
-                        }
-line
+[_string substringWithRange:lineRange]
-                                // --- get frequency
-                                secondsPerTick = 1.0 / (double) [[tree->_variables objectForKey:@"hz"] floatValue];
-
+
-                                // --- beginning of data dump
-                                state = TNParserStateData;
@@ -178 +299 @@
-                        }
-                }
-                else if(state == TNParserStateData && [line length] > 0) {
-                        unichar         type;
-                        
-                        type = [line characterAtIndex:0];
-                        
-                        if(type == '+' || type == '*') {
-                                TNSub                   *sub;
-                                unsigned int    index;
-                
-                                // --- retrieve previously saved sub
-                                sub = [_subs objectForKey:line];
-                                
-                                if(!sub)
-                                        continue;
-                                
-                                // --- add a node
-                                index = [parentNode indexOfChildWithSub:sub];
-                                
-                                if(index == NSNotFound) {
-                                        node = [[TNNode alloc] initWithParent:parentNode sub:sub];
-                                        [parentNode addChild:node];
-                                        [node release];
-                                } else {
-                                        node = [parentNode->_children objectAtIndex:index];
-                                        node->_calls++;
-                                }
-                                
-                                // --- add for timing
-                                [_nodes addObject:node];
-
-                                // --- climb up
-                                parentNode = node;
-                        }
-                        else if(type == '-') {
-                                if([line characterAtIndex:2] != '&') {
-                                        // --- climb down
-                                        parentNode = parentNode->_parent;
-                                }
-                        }
-                        else if(type == '&') {
-                                NSString                *key, *package, *name;
-                                TNSub                   *sub;
-                                NSRange                 range;
-                                unsigned int    lineLength, lineOffset;
-                                
-                                lineLength = [line length];
-                                lineOffset = 2;
-
-                                // --- extract key
-                                range           = [line rangeOfString:@" " options:0 range:NSMakeRange(lineOffset, lineLength - lineOffset)];
-                                key                     = [line substringWithRange:NSMakeRange(lineOffset, range.location - lineOffset)];
-                                lineOffset      = range.location + 1;
-
-                                // --- extract package
-                                range           = [line rangeOfString:@" " options:0 range:NSMakeRange(lineOffset, lineLength - lineOffset)];
-                                package         = [line substringWithRange:NSMakeRange(lineOffset, range.location - lineOffset)];
-                                lineOffset      = range.location + 1;
-                                
-                                // --- extract name
-                                name            = [line substringWithRange:NSMakeRange(lineOffset, lineLength - lineOffset)];
-
-                                // --- add a sub
-                                sub = [[TNSub alloc] initWithPackage:package name:name color:[self colorForPackage:package]];
-                                [_subs setObject:sub forKey:[@"+ " stringByAppendingString:key]];
-                                [sub release];
-                        }
-                        else if(type == '@') {
-                                unsigned int    i, count, stime, utime, ticks;
-                                
-                                count = [_nodes count];
-                                
-                                if(count > 0) {
-                                        utime = [[line substringWithRange:NSMakeRange(2, 1)] intValue];
-                                        stime = [[line substringWithRange:NSMakeRange(4, 1)] intValue];
-                                        ticks = utime + stime;
-                                        
-                                        if(ticks > 0) {
-                                                double          time;
-                                                
-                                                // --- add time for all nodes since last timestamp
-                                                time = (ticks * secondsPerTick) / count;
-                                                
-                                                for(i = 0; i < count; i++)
-                                                        [[_nodes objectAtIndex:i] addTime:time];
-
-                                                [_nodes removeAllObjects];
-                                        }
-                                }
-                        }
-                }
-        }
-        
@@ -273 +304 @@
-        [rootNode refreshPercent];
-        
+        NSLog(@"%.2fms", ([NSDate timeIntervalSinceReferenceDate] - time) * 1000.0);
+
-        return tree;
-}
@@ -278 +311 @@
-
-
-
+_
-        NSColor         *color;
-        
@@ -296 +329 @@
-
-@end
+
+
+
+@implementation TNParser
+
++ (TNTree *)parseWithString:(NSString *)string {
+        TNParser        *parser;
+        
+        parser = [[[self alloc] _initWithString:string] autorelease];
+
+        return [parser _parse];
+}
+
+
+
+#pragma mark -
+
+- (void)dealloc {
+        [_string release];
+        
+        CFRelease(_nodes);
+        CFRelease(_subs);
+        
+        [_usedColors release];
+        
+        [_colors release];
+        
+        [super dealloc];
+}
+
+@end

Tuna/trunk/TNProfilerController.m

@@ -156 +156 @@
-        
-        if(document) {
+                [document updateChangeCount:NSChangeDone];
-                [document showWindows];
-                [document retain];