Remove the |session| ivar from GDBpConnection. Use |transactionID| to keep

track of individual message transactions with the debugger engine.

diff --git a/Source/DebuggerController.m b/Source/DebuggerController.m
index 17af9e26fea0033dc9ca40ca5601b4c5ea897200..b425c62d9dbf61b3b6106692f62fc856470607b6 100644 (file)
--- a/Source/DebuggerController.m
+++ b/Source/DebuggerController.m
@@ -41,7 +41,7 @@
                stackController = [[StackController alloc] init];
                
                NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
-               connection = [[GDBpConnection alloc] initWithPort:[defaults integerForKey:@"Port"] session:[defaults stringForKey:@"IDEKey"]];
+               connection = [[GDBpConnection alloc] initWithPort:[defaults integerForKey:@"Port"] ideKey:[defaults stringForKey:@"IDEKey"]];
                connection.delegate = self;
                expandedVariables = [[NSMutableSet alloc] init];
                [[self window] makeKeyAndOrderFront:nil];
@@ -70,7 +70,7 @@
 - (void)awakeFromNib
 {
        [[self window] setExcludedFromWindowsMenu:YES];
-       [[self window] setTitle:[NSString stringWithFormat:@"GDBp @ %@:%d/%@", [connection remoteHost], [connection port], [connection session]]];
+       [[self window] setTitle:[NSString stringWithFormat:@"GDBp @ %@:%d/%@", [connection remoteHost], [connection port], [connection ideKey]]];
        [sourceViewer setDelegate:self];
        [stackArrayController setSortDescriptors:[NSArray arrayWithObject:[[[NSSortDescriptor alloc] initWithKey:@"index" ascending:YES] autorelease]]];
 }

diff --git a/Source/GDBpConnection.h b/Source/GDBpConnection.h
index 7c06b1f7969e99a85b574e5a4d3657577184ed1d..d943345b23c813230010d5fb7eac16d90915d490 100644 (file)
--- a/Source/GDBpConnection.h
+++ b/Source/GDBpConnection.h
@@ -24,9 +24,14 @@
 @interface GDBpConnection : NSObject <SocketWrapperDelegate>
 {
        int port;
-       NSString* session;
        BOOL connected;
        
+       /**
+        * An ever-increasing integer that gives each transaction a unique ID for
+        * the debugging engine. Managed by |-createCommand:|.
+        */
+       int transactionID;
+       
        /**
         * Human-readable status of the connection
         */
@@ -42,11 +47,10 @@
 @property (assign) id <GDBpConnectionDelegate> delegate;
 
 // initializer
-- (id)initWithPort:(int)aPort session:(NSString*)aSession;
+- (id)initWithPort:(int)aPort;
 
 // getter
 - (int)port;
-- (NSString*)session;
 - (NSString*)remoteHost;
 - (BOOL)isConnected;
 - (NSArray*)getCurrentStack;

diff --git a/Source/GDBpConnection.m b/Source/GDBpConnection.m
index fd5096ee676a64f3bc5d29ad124f1ccd9deea436..d0f00c168f6537a05384cc19f8bf73e50658403a 100644 (file)
--- a/Source/GDBpConnection.m
+++ b/Source/GDBpConnection.m
@@ -38,12 +38,11 @@
  * Creates a new DebuggerConnection and initializes the socket from the given connection
  * paramters.
  */
-- (id)initWithPort:(int)aPort session:(NSString*)aSession;
+- (id)initWithPort:(int)aPort
 {
        if (self = [super init])
        {
                port = aPort;
-               session = [aSession retain];
                connected = NO;
                
                // now that we have our host information, open the socket
@@ -64,7 +63,6 @@
 - (void)dealloc
 {
        [socket release];
-       [session release];
        [super dealloc];
 }
 
@@ -76,14 +74,6 @@
        return port;
 }
 
-/**
- * Gets the session name
- */
-- (NSString*)session
-{
-       return session;
-}
-
 /**
  * Returns the name of the remote host
  */
@@ -257,7 +247,7 @@
 #pragma mark Private
 
 /**
- * Helper method to create a string command with the -i <session> automatically tacked on. Takes
+ * Helper method to create a string command with the -i <transaction id> automatically tacked on. Takes
  * a variable number of arguments and parses the given command with +[NSString stringWithFormat:]
  */
 - (NSString*)createCommand:(NSString*)cmd, ...
@@ -271,7 +261,7 @@
        if ([[[[NSProcessInfo processInfo] environment] objectForKey:@"TransportDebug"] boolValue])
                NSLog(@"--> %@", cmd);
        
-       return [NSString stringWithFormat:@"%@ -i %@", [format autorelease], session];
+       return [NSString stringWithFormat:@"%@ -i %d", [format autorelease], transactionID++];
 }
 
 /**
@@ -411,6 +401,7 @@
 - (void)doSocketAccept:_nil
 {
        connected = YES;
+       transactionID = 0;
        [socket receive];
        [self updateStatus];