Changeset 811 for trunk

Timestamp:

Aug 21, 2006, 11:47:29 PM (16 years ago)

Author:

livings124

Message:

This should be a safer implementation of the message log.

Location:

trunk/macosx

Files:

• MessageWindowController.h (modified) (1 diff, 1 prop)
• MessageWindowController.m (modified) (4 diffs, 1 prop)

trunk/macosx/MessageWindowController.h

@@ -31 +31 @@
     
     NSLock * fLock;
+    NSMutableArray * fBufferArray;
+    NSTimer * fTimer;
 }
 
 void addMessage(int level, const char * message);
 - (void) addMessage: (const char *) message level: (int) level;
+- (void) updateLog: (NSTimer *) timer;
 
 - (void) changeLevel: (id) sender;

trunk/macosx/MessageWindowController.m

@@ -30 +30 @@
 #define LEVEL_DEBUG 2
 
+#define UPDATE_SECONDS 1.0
+
 @interface MessageWindowController (Private)
 
@@ -45 +47 @@
         
         fLock = [[NSLock alloc] init];
+        fBufferArray = [[NSMutableArray alloc] init];
+        
+        fTimer = [NSTimer scheduledTimerWithTimeInterval: UPDATE_SECONDS target: self
+                    selector: @selector(updateLog:) userInfo: nil repeats: YES];
         
         [[self window] update]; //make sure nib is loaded right away
@@ -53 +59 @@
 - (void) dealloc
 {
+    [fTimer invalidate];
+    
     [fLock release];
+    [fBufferArray release];
+    
     [super dealloc];
 }
@@ -101 +111 @@
     
     [fLock lock];
-    [[fTextView textStorage] appendAttributedString: messageString];
+    [fBufferArray addObject: messageString];
     [fLock unlock];
     
     [pool release];
+}
+
+- (void) updateLog: (NSTimer *) timer
+{
+    [fLock lock];
+    
+    NSEnumerator * enumerator = [fBufferArray objectEnumerator];
+    NSAttributedString * messageString;
+    while ((messageString = [enumerator nextObject]))
+        [[fTextView textStorage] appendAttributedString: messageString];
+    
+    [fBufferArray removeAllObjects];
+    
+    [fLock unlock];
 }