Changeset 11064

Timestamp:

03/11/10 03:32:39 (2 years ago)

Author:

adamk

Message:

Landing the slave master quick-spawn change, which reduces average memory cost of Padre by 25%

Location:

trunk/Padre

Files:

• Changes (modified) (1 diff)
• lib/Padre.pm (modified) (2 diffs)
• lib/Padre/SlaveDriver.pm (modified) (4 diffs)
• lib/Padre/Startup.pm (modified) (3 diffs)
• lib/Padre/Wx/App.pm (modified) (2 diffs)

trunk/Padre/Changes

@@ -3 +3 @@
 
 0.59 To Be Released
-    - Don't crash open file list dialog on unsaved files or without files
-      (SEWI)
+    - Don't crash open file list dialog on unsaved files or without
+      files (SEWI)
     - Added a small survey for new Padre installation (SEWI)
     - Resolved the clash between threads and SQLite by temporarily
       disconnecting from SQLite during a thread spawn (ADAMK)
-    - Move the slave driver spawn into Padre::Startup, so that
-      we get much much smaller thread spawn memory penalty from the
-      interpreter copy (ADAMK)
+    - Slave master quick-spawning in Padre::Startup, so that
+      we get smaller thread spawn memory penalty from the
+      interpreter copy. On Win32 the per-thread cost drops from
+      34.1meg to 20meg with a reduction in total memory use for a
+      typical user of about 20% (ADAMK)
 
 0.58 2010.03.08

trunk/Padre/lib/Padre.pm

@@ -149 +149 @@
     # Create the main window
     require Padre::Wx::App;
-    $self->{wx} = Padre::Wx::App->new($self);
+    $self->{wx} = Padre::Wx::App->create($self);
 
     # Create the task manager
@@ -158 +158 @@
 
     # Create the action queue
-    $self->{actionqueue} = Padre::Action::Queue->new();
+    $self->{actionqueue} = Padre::Action::Queue->new;
 
     # Startup completed, let go of the database

trunk/Padre/lib/Padre/SlaveDriver.pm

@@ -80 +80 @@
 
         # Wx must be loaded before this code fires
+        require Wx;
         require Wx::Event;
         $TASK_DONE_EVENT  = Wx::NewEventType() unless defined $TASK_DONE_EVENT;
@@ -123 +124 @@
 
 sub spawn {
-    my $self         = shift;
-    my $task_manager = shift;
+    my $self    = shift;
+    my $manager = shift;
 
     require Storable;
     $self->{cmd_queue}->enqueue(
-        Storable::freeze( [ $task_manager->task_queue ] )
+        Storable::freeze( [ $manager->task_queue ] )
     );
 
@@ -194 +195 @@
     @_ = (); # Hack to avoid "Scalars leaked"
 
-    require Storable;
-    require Padre::TaskManager;
-
-    # Set the thread-specific main-window pointer
-    my $wx = Padre->ide->wx;
-
-    # warn threads->tid() . " -- Hi, I'm a thread.";
-
-    while ( my $frozen_task = $queue->dequeue ) {
-
-        # warn threads->tid() . " -- got task.";
+    # warn threads->tid . " -- Hi, I'm a thread.";
+
+    # Hold a pointer to the global application root
+    require Padre::Wx::App;
+    my $wx = Padre::Wx::App->new;
+
+    while ( my $frozen = $queue->dequeue ) {
+
+        # warn threads->tid . " -- got task.";
 
         # warn("THREAD TERMINATING"), return 1 if not ref($task) and $task eq 'STOP';
-        return 1 if not ref($frozen_task) and $frozen_task eq 'STOP';
-
-        my $task = Padre::Task->deserialize( \$frozen_task );
+        return 1 if not ref($frozen) and $frozen eq 'STOP';
+
+        require Padre::Task;
+        my $task = Padre::Task->deserialize( \$frozen );
         $task->{__thread_id} = threads->tid;
 
-        my $thread_start_event = Wx::PlThreadEvent->new(
+        my $before = Wx::PlThreadEvent->new(
             -1,
             $TASK_START_EVENT,
             $task->{__thread_id} . ";" . ref($task),
         );
-        Wx::PostEvent( $wx, $thread_start_event );
+        Wx::PostEvent( $wx, $before );
 
         # RUN
@@ -223 +223 @@
 
         # FREEZE THE PROCESS AND PASS IT BACK
-        undef $frozen_task;
-        $task->serialize( \$frozen_task );
-
-        my $thread_done_event = Wx::PlThreadEvent->new(
+        undef $frozen;
+        $task->serialize( \$frozen );
+
+        my $after = Wx::PlThreadEvent->new(
             -1,
             $TASK_DONE_EVENT,
-            $frozen_task,
+            $frozen,
         );
-        Wx::PostEvent( $wx, $thread_done_event );
-
-        # warn threads->tid() . " -- done with task.";
+        Wx::PostEvent( $wx, $after );
+
+        # warn threads->tid . " -- done with task.";
     }
 }
 
 sub _slave_driver_loop {
-    my ( $inqueue, $outqueue ) = @_;
-    @_ = (); # hack to avoid "Scalars leaked"
-
-    while ( my $args = $inqueue->dequeue ) { # args is frozen [$main, $queue]
+    my ( $in, $out ) = @_;
+    @_ = (); # Hack to avoid "Scalars leaked"
+
+    while ( my $args = $in->dequeue ) { # args is frozen [$main, $queue]
         last if $args eq 'STOP';
-        my $task_queue    = Padre::SlaveDriver->new->task_queue;
-        my $worker_thread = threads->create( \&_worker_loop, $task_queue );
-        $outqueue->enqueue( $worker_thread->tid );
+        my $queue  = Padre::SlaveDriver->new->task_queue;
+        my $worker = threads->create( \&_worker_loop, $queue );
+        $out->enqueue( $worker->tid );
     }
 

trunk/Padre/lib/Padre/Startup.pm

@@ -99 +99 @@
             }
             foreach my $file (@ARGV) {
+                require File::Spec;
                 my $path = File::Spec->rel2abs($file);
                 $socket->print("open $path\n");
@@ -106 +107 @@
             return 0;
         }
+    }
+
+    # NOTE: Replace the following with if ( 0 ) will disable the
+    # slave master quick-spawn optimisation.
+
+    # If we are going to use threading, spawn off the slave
+    # driver as early as we possibly can so we reduce the amount of
+    # wasted memory copying to a minimum.
+    if ( $setting{threads} ) {
+        require Padre::SlaveDriver;
+        Padre::SlaveDriver->new;
     }
 
@@ -162 +174 @@
     }
 
-    # If we are going to use threading, spawn off the slave
-    # driver as early as we possibly can so we reduce the amount of
-    # wasted memory copying to a minimum.
-    if ( $setting{threads} and 0 ) {
-        require Padre::SlaveDriver;
-        Padre::SlaveDriver->new;
-    }
-
     return 1;
 }

trunk/Padre/lib/Padre/Wx/App.pm

@@ -31 +31 @@
 use strict;
 use warnings;
-use Carp ();
-use Params::Util qw{ _INSTANCE };
+use Carp      ();
 use Padre::Wx ();
 
@@ -45 +44 @@
 # Constructor and Accessors
 
-sub new {
-    my $class = shift;
-    my $ide   = shift;
-    unless ( _INSTANCE( $ide, 'Padre' ) ) {
-        Carp::croak("Did not provide the ide object to Padre::App->new");
+sub create {
+    my $self = shift->new;
+
+    # Check IDE param
+    my $ide = shift;
+    require Params::Util;
+    unless ( Params::Util::_INSTANCE($ide, 'Padre') ) {
+        Carp::croak("Did not provide the ide object to Padre::App->create");
     }
-
-    # Create the Wx object
-    my $self = $class->SUPER::new;
 
     # Save a link back to the parent ide