Changeset 381

Timestamp:

05/25/07 19:14:14 (1 year ago)

Author:

kindlund

Message:

Housekeeping and testing of non-require use of Integrity object.
At first glance, it looks like the source of the thread crashing was the use of Storable objects between threads.

Files:

• honeyclient/branches/exp/kindlund-filesystem/lib/HoneyClient/Agent.pm (modified) (13 diffs)

honeyclient/branches/exp/kindlund-filesystem/lib/HoneyClient/Agent.pm

@@ -196 +196 @@
-# TODO: Include corresponding unit tests.
-# XXX: Check if this is still needed.
-#
+
-
-# Include Thread Libraries
@@ -377 +377 @@
-# XXX: Disabled temporarily.
-    if ($PERFORM_INTEGRITY_CHECKS) {
-
+#
-        $gintegrity = HoneyClient::Agent::Integrity->new();
-        $gintegrity->closeFiles();
@@ -708 +708 @@
-            print "Creating a new run() child thread...\n";
-        }
-
-# XXX: If the old thread is dead, we could potentially
-# join it, in order to avoid detach warnings upon exit.
-
-        # Quickly define a temporary thread ID.
@@ -729 +726 @@
-        _unlock($data);
-
-childThread
+worker
-                                  {
-                                    'driver_name' => $driverName,
@@ -744 +741 @@
-            # XXX: Debugging, remove eventually. 
-            print "Thread ID = " . $thread->tid() . "\n";
-            #$data->{$driverName}->{'thread_id'} = $thread->tid();
-        } else {
-            # XXX: Debugging, remove eventually. 
-            print "Thread ID = " . $thread->tid() . " (NOT RUNNING)\n";
-            #print "Thread ID = undef\n";
-            #$data->{$driverName}->{'thread_id'} = undef;
-        }
-
-        # Release data lock.
-        _unlock($data);
-
-# XXX: Check to see if this works okay.
-#        $thread->join();
-    }
-
@@ -783 +774 @@
-# to properly deal with exceptions/faults that occur within this
-# thread.
-childThread
+worker
-
-    # Extract arguments.
@@ -789 +780 @@
-
-    my $driverName = $args->{'driver_name'};
-
+ 
-
-    # Temporary variable, used to hold thawed driver data.
@@ -795 +786 @@
-
-# XXX: Check if we need this.
-#
+
-
-    # Trap all faults that may occur from these asynchronous operations.
@@ -813 +804 @@
-        $data = _lock();
-
-        #if ($PERFORM_INTEGRITY_CHECKS) {
-        #    require HoneyClient::Agent::Integrity;
-        #    # XXX: WARNING - The $integrityState object data is NOT thread-safe
-        #    # (since it relies on external data stored on the file system).
-        #    # As such, do NOT try to call integrity checks on multiple, simultaneous
-        #    # asynchronous threaded drivers.
-        #    #$integrity = thaw($integrityState);
-        #    # Perform initial integrity baseline check.
-        #    #print "Initializing Integrity Check...\n";
-        #    # TODO: Initialize Integrity Checks
-        #    $integrity = HoneyClient::Agent::Integrity->new();
-        #}
-
-        # Now, initialize each driver object. 
-        # Figure out which $driver object to use...
-        my $driverClass = 'HoneyClient::Agent::Driver::Browser::' . $driverName;
-# XXX: See if this is still needed.
-#        eval "require $driverClass";
-#        if ($@) {
-#            Carp::croak "$@";
-#        }
-
-        if (!defined($data->{$driverName}->{'state'})) {
@@ -864 +837 @@
-        $data->{$driverName}->{'status'}->{'is_running'} = 1;
-        $data->{$driverName}->{'state'} = $driver;
-
-# XXX: Check to see if this is okay.
-#       if ($driver->isFinished()) {
-#           # Thread is about to finish, set the ID back to undef.
-#           # This looks ugly, but setting it this early avoids the
-#           # potential race condition of when the run() thread is finished
-#           # and when updateState() checks for $driverData->{$driverName}->{'thread_id'}
-#           # to be set to undef.
-#           $data->{$driverName}->{'thread_id'} = undef;
-#       }
-
-        # Release lock on stored driver state.
@@ -960 +923 @@
-        $data->{$driverName}->{'state'} = $driver;
- 
-        # Thread is about to finish, set the ID back to undef.
-# XXX: Check to see if this is okay.
-#       $data->{$driverName}->{'thread_id'} = undef;
-
-        # Release lock on stored driver state.
-        _unlock($data);
@@ -969 +928 @@
-        # XXX: Debugging, remove eventually. 
-        print "Exiting run() thread.\n";
-        #print Dumper($driver);
-        # Verbose debugging:
-        #print Dumper($driver->status());
-        # Short-hand debugging:
-        #my $status = $driver->status();
-        #print "R(" . $status->{relative_links_remaining} . ") | [ " .
-        #      "V(" . $status->{links_remaining} . ") + ".
-        #      "P(" . $status->{links_processed} . ") = " .
-        #      "T(" . $status->{links_total} . ") ] " .
-        #      "| (" . $status->{percent_complete} . ")\n";
-    };
-    
@@ -992 +941 @@
-        _unlock();
-
-        # Acquire lock on stored driver state.
-        $data = _lock();
-                 
-        # Make sure we update our state to reflect ourself dying.
-# XXX: Check to see if this is okay.
-#       $data->{$driverName}->{'thread_id'} = undef;
-
-        # Release lock on stored driver state.
-        _unlock($data);
-    
-        # TODO: Do proper fault queuing.
-        print "FAULT: " . $@ . "\n";