/[cvs]/nfo/perl/libs/shortcuts.pm
ViewVC logotype

Diff of /nfo/perl/libs/shortcuts.pm

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.13 by joko, Mon Jun 23 20:58:31 2003 UTC revision 1.16 by joko, Wed Jun 25 22:49:56 2003 UTC
# Line 2  Line 2 
2  ##  $Id$  ##  $Id$
3  ## ---------------------------------------------------------------------------  ## ---------------------------------------------------------------------------
4  ##  $Log$  ##  $Log$
5    ##  Revision 1.16  2003/06/25 22:49:56  joko
6    ##  RUNNING_IN_HELL mode for detach option
7    ##
8    ##  Revision 1.15  2003/06/24 20:21:12  jonen
9    ##  + changed linux part of run_cmd to use Proc::Background instead of IPC::...
10    ##
11    ##  Revision 1.14  2003/06/24 20:13:18  joko
12    ##  + sub findpatch
13    ##  + now using findpatch and Proc::Background for win32/perl
14    ##
15  ##  Revision 1.13  2003/06/23 20:58:31  joko  ##  Revision 1.13  2003/06/23 20:58:31  joko
16  ##  restructured, hopefully makes Linux and Windows (and *BSD) more compatible...  what about IPC::Cmd???  ##  restructured, hopefully makes Linux and Windows (and *BSD) more compatible...  what about IPC::Cmd???
17  ##  ##
# Line 67  our @EXPORT_OK = qw( Line 77  our @EXPORT_OK = qw(
77  use Data::Dumper;  use Data::Dumper;
78  use POSIX qw( strftime );  use POSIX qw( strftime );
79  #use IPC::Run qw( run timeout );  #use IPC::Run qw( run timeout );
80  use IPC::Run qw( start pump finish timeout run ) ;  use IPC::Run qw( start pump finish timeout run timer ) ;
81  use Carp;  use Carp;
82    
83  # NEW - 2003-06-23 for Linux (what about *BSD?)  # NEW - 2003-06-23 for Linux (what about *BSD?)
84  use IPC::Session;  use IPC::Session;
85    
86    use File::Spec;
87    use Proc::Background;
88    
89    
90  # $now_string = strftime "%a %b %e %H:%M:%S %Y", localtime;  # $now_string = strftime "%a %b %e %H:%M:%S %Y", localtime;
91  # see "perldoc -f localtime"  # see "perldoc -f localtime"
# Line 119  sub get_interpreter_wrapper { Line 132  sub get_interpreter_wrapper {
132        
133      if (RUNNING_IN_HELL()) {      if (RUNNING_IN_HELL()) {
134        # Required to adapt to IPC::Run on win32.        # Required to adapt to IPC::Run on win32.
135        $wrapper = 'cmd.exe /C perl';        #$wrapper = 'cmd.exe /C perl';
136          #$wrapper = 'start perl';
137          $wrapper = 'perl';
138          #$wrapper = 'cmd.exe /C';
139      } else {      } else {
140        # NEW 2003-06-23 - needed if used with IPC::Session (at Linux)        # NEW 2003-06-23 - needed if used with IPC::Session (at Linux)
141        #  whats about Win32?        #  whats about Win32?
# Line 139  sub run_cmd { Line 155  sub run_cmd {
155    my $caption = shift;    my $caption = shift;
156    my $options = shift;    my $options = shift;
157        
158    #print Dumper($options);    #print STDOUT "run_cmd - options: ", Dumper($options), "\n";
159        
160    # report - header    # report - header
161    my $sep = "-" x 60;    my $sep = "-" x 60;
162    print STDERR $sep, "\n";    print STDOUT $sep, "\n";
163    print STDERR "  ", $cmd;    print STDOUT "  ", $cmd;
164    print STDERR " - ", $caption if $caption;    print STDOUT " - ", $caption if $caption;
165    print STDERR "\n", $sep, "\n";    print STDOUT "\n", $sep, "\n";
166        
167    # strip name of executable from full command string    # strip name of executable from full command string
168    $cmd =~ m/(.+?)\s/;    $cmd =~ m/^(.+?)\s(.*)$/;
169    my $executable = $1;    my $executable = $1;
170      my $executable_args = $2;
171        
172  =pod  =pod
173    # for unix: check if executable is in local directory, if so - prefix with './'    # for unix: check if executable is in local directory, if so - prefix with './'
# Line 169  sub run_cmd { Line 186  sub run_cmd {
186    if ($basedir) {    if ($basedir) {
187      -e "$basedir/$executable" or die("$basedir/$executable does not exist.");      -e "$basedir/$executable" or die("$basedir/$executable does not exist.");
188      $basedir .= '/';      $basedir .= '/';
189        $cmd = "$basedir$cmd";
190    } elsif ($use_path) {    } elsif ($use_path) {
191      $basedir = "";      #$basedir = "";
192        $basedir = findpath($executable);
193        #print "basedir: $basedir", "\n";
194        my $abspath = File::Spec->catfile($basedir, $executable);
195        #print STDOUT "PATH: ", $abspath, "\n";
196        -e $abspath or die("$abspath does not exist.");
197        $cmd = $abspath . ' ' . $executable_args;
198    } else {    } else {
199      -e $executable or die("$executable does not exist.");      -e $executable or die("$executable does not exist.");
200      #$basedir = ".";      #$basedir = ".";
201      #$basedir .= './';      #$basedir .= './';
202      $basedir = "";      $basedir = "";
203        $cmd = "$basedir$cmd";
204    }    }
   $cmd = "$basedir$cmd";  
205    
206    # V1 - backticks or qq{}    # V1 - backticks or qq{}
207    #`$cmd`;    #`$cmd`;
# Line 186  sub run_cmd { Line 210  sub run_cmd {
210    # V2 - via 'system'    # V2 - via 'system'
211    #system($cmd);    #system($cmd);
212    
213    if (not $use_path) {    #if (not $use_path) {
214      my $application = get_executable($cmd);      my $application = get_executable($cmd);
215      $cmd = "$application$cmd" if $application;      $cmd = "$application$cmd" if $application;
216    }    #}
217    
218      my @cmd = split(' ', $cmd);
219    
220    # V3 - using IPC (optional)    # V3 - using IPC (optional)
221    if ($options->{async}) {    if ($options->{async}) {
222    
223      #run \@cmd, \$in, \$out, \$err, timeout( 10 ) or die "cat: $?";      #run \@cmd, \$in, \$out, \$err, timeout( 10 ) or die "cat: $?";
224      my @cmd = split(' ', $cmd);  
225            print STDOUT "run_cmd[async]: Proc::Background: $cmd", "\n";
226            
227      # V3.1 - using IPC::Run      # V3.1 - using IPC::Run
228      #      #
# Line 205  sub run_cmd { Line 231  sub run_cmd {
231      if (RUNNING_IN_HELL()) {      if (RUNNING_IN_HELL()) {
232            
233        #my $in; my $out; my $err;        #my $in; my $out; my $err;
234        print STDERR "run_cmd: IPC::Run: $cmd", "\n";        
235          #print STDOUT "findpath: ", findpath('rap.pl'), "\n";
236                
237        # no success!        # no success!
238        #start \@cmd, timeout(0) or croak("run_cmd: IPC::Run could not start '$cmd'.");        #start \@cmd, timeout(0) or croak("run_cmd: IPC::Run could not start '$cmd'.");
239        #        #
240        # success on Win32, but seems broken at 'timeout' on linux:        # success on Win32, but seems broken at 'timeout' on linux:
241        run(\@cmd, timeout(4)) or croak("run_cmd: IPC::Run could not start '$cmd'.");        #run(\@cmd, timeout(3)) or croak("run_cmd: IPC::Run could not start '$cmd'.");
242          #start(\@cmd, timer(2)) or croak("run_cmd: IPC::Run could not start '$cmd'.");
243          #start(\@cmd, \undef) or croak("run_cmd: IPC::Run could not start '$cmd'.");
244          #start \@cmd or croak("run_cmd: IPC::Run could not start '$cmd'.");
245          #start(\@cmd, timeout(1)) or croak("run_cmd: IPC::Run could not start '$cmd'.");      
246                        
247        # other tests ;)        # other tests ;)
248        #$IPC::Run::Timer::timeout = 2000;        #$IPC::Run::Timer::timeout = 2000;
249        #start $cmd or die("IPC::Run could not start '$cmd'.");        #start $cmd or die("IPC::Run could not start '$cmd'.");
250                
251          #my $in; my $out; my $t;
252          #my $harness = start( \@cmd, \$in, \$out, $t = timer( 5 ) ) ;
253          #my $harness = start( \@cmd ) ;
254          #$harness->pump_nb();
255          
256          #my $postfix = '2>&1 |';
257          #open PIPE, "$cmd $postfix" or die("run_cmd: could not run in background via open!");
258          
259          my $proc1 = Proc::Background->new(@cmd);
260          print "pid: ", $proc1->pid(), "\n";
261    
262          
263      } else {      } else {
264    
265        print STDERR "run_cmd: IPC::Session: $cmd", "\n";        #print STDOUT "run_cmd: IPC::Session: $cmd", "\n";
266    
267        # V3.2 - using IPC::Session        # V3.2 - using IPC::Session
268        #  success on Linux AND Win32 ??        #  success on Linux AND Win32 ??
269        #        #
270        # set timeout:        # set timeout:
271        #  (don't really know why we needs 2 secconds        #  (don't really know why we needs some secconds
272        #   to wait for init of process !?!)        #   to wait for init of process !?!)
273        my $session_timeout = 3;        #my $session_timeout = 15;
274        # set session name (default: cmd as string):        # set session name (default: cmd as string):
275        my $session_name = $cmd;        #my $session_command = $cmd;
276        # create session:        #my $session_shell = "/bin/sh";
277        my $session = IPC::Session->new($session_name, $session_timeout);        # create session (beware of using '->new' here!?):
278          #my $session = new IPC::Session($session_shell, $session_timeout);
279                
280        # send 'cmd' to session - not required since complete command is sent via constructor above        # send 'cmd' to session - not required since complete command is sent via constructor above
281        $session->send(\@cmd);        #$session->send($cmd);
282          
283        #print $session->stdout(), "\n";        #my $output = $session->stdout();
284          #print "WS::Admin started.\n" if $output = ' ';
285    
286          # tests
287          #$session->send("echo hello");
288          #chomp(my $hello = $session->stdout());      
289          #print "ok 3\n" if $hello eq "hello";
290                
291        # optional switch case:        # optional switch case:
292        #for ($session->stdout()) {        #for ($session->stdout()) {
293          #  /_bootDataBases/ && do { print "WS::Admin started.\n" };
294        #}        #}
295        # optional get error:        # optional get error:
296        #my $err = session->stderr();        #my $err = session->stderr();
297          #print "ERR: " . Dumper($err) . "\n";
298    
299          #open( *OUT, ">out.txt" ) ;
300          #open( *ERR, ">err.txt" ) ;
301          #run(\@cmd, \undef,  \*OUT, \*ERR  ) or croak("run_cmd: IPC::Run could not start '$cmd'.");
302          #my ($out, $err);
303          #my $h = start(\@cmd, \undef,  \*OUT, \*ERR  ) or croak("run_cmd: IPC::Run could not start '$cmd'.");
304          #finish $h if $err =~ /error/;
305          
306          # get child pid
307          #my $kid;
308          #do { $kid=wait(); } until $kid > 0;
309          #print "Child PID: " . $kid . "n";
310    
311          #finish $h;
312    
313          
314          # test using Proc::Background - success !!
315          my $proc = Proc::Background->new($cmd);
316          my $kid = $proc->pid();
317          print STDOUT "run_cmd: Proc::Background: $cmd, child PID $kid", "\n";
318          $proc->wait();
319          $proc->die();
320    
321      }      }
322        
323    
324      } elsif ($options->{detach}) {
325    
326        if (RUNNING_IN_HELL()) {
327          print STDOUT "run_cmd[detach]: Proc::Background: $cmd", "\n";
328          my $proc1 = Proc::Background->new(@cmd);
329          print "pid: ", $proc1->pid(), "\n";
330        } else {
331          print STDERR "run_cmd[detach]: system('$cmd' &).", "\n";
332          system($cmd . ' &');    
333        }
334    
335    } else {    } else {
336      print STDERR "run_cmd: system('$cmd').", "\n";      print STDOUT "run_cmd: system('$cmd').", "\n";
337      system($cmd);      system($cmd);
338    }    }
339        
340    print STDERR "run_cmd: ready.", "\n";    print STDOUT "run_cmd: ready.", "\n";
341        
342  }  }
343    
# Line 303  sub make_guid Line 390  sub make_guid
390      return $guid;      return $guid;
391    }    }
392    
393    # [modified] from: http://www.mit.edu/afs/athena/contrib/watchmaker/src/pt/Configure
394    sub findpath {
395        #local($path);
396        #local($arg) = shift;
397        my $arg = shift;
398        my $path;
399        #for my $dir (split(/:/,$ENV{'PATH'})) {
400        for my $dir (File::Spec->path()) {
401            #if (-x "$dir/$arg" && -f _) {
402            #print STDOUT "scanning: ", "$dir/$arg", "\n";
403            if (-e "$dir/$arg") {
404                #$path = "$dir/$arg";
405                #$path = "$dir/";
406                $path = $dir;
407                last;
408            }
409        }
410        $path;
411    }
412    
413  1;  1;
414  __END__  __END__
Legend:
Removed from v.1.13  
changed lines
  Added in v.1.16
MailToCvsAdmin">MailToCvsAdmin
 ViewVC Help
Powered by ViewVC 1.1.26 RSS 2.0 feed