Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-02 13:27:32 +08:00
Code Issues Actions 26 Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
Antoine Drouin
2005-08-20 22:02:02 +00:00
parent 1239174aa5
commit ab89cc29e6
4 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/supervision/Paparazzi/CpGui.pm
+1 -1
View File
@@ -17,7 +17,7 @@ sub populate {
my ($self, $args) = @_;
$self->SUPER::populate($args);
$self->configspec(-logo_file => [S_NOINIT, S_PASSIVE, S_RDWR, S_OVRWRT, S_NOPRPG, undef],
-variables => [S_SUPER, S_SUPER, S_SUPER, S_SUPER, S_SUPER, undef],
-variables => [S_SUPER, S_SUPER, S_SUPER, S_SUPER, S_SUPER, {}],
);
}
sub completeinit {
sw/supervision/Paparazzi/CpSessionMgr.pm
+25 -11
View File
@@ -26,22 +26,30 @@ sub completeinit {
my ($self) = @_;
$self->SUPER::completeinit();
my $cfg_file = $self->get('-config_file');
# my $variables = $self->get('-variables');
# print "initial variables\n".Dumper($variables);
my $variables = $self->get('-variables');
$self->read_cfg($cfg_file);
# $variables = $self->get('-variables');
# print "configured variables\n".Dumper($variables);
}
sub prepare_args {
my ($self, $args) = @_;
my ($self, $args, $session) = @_;
my (@options, @rargs);
my $variables = $self->get('-variables');
# print "CpSessionMgr : variables ".Dumper($variables);
foreach my $opt (@{$args}) {
my $type = $opt->{type};
my $flag = $opt->{flag};
my $value = $type eq 'var' ? $variables->{$opt->{value}}: $opt->{value};
my $value;
if ($type eq 'var') {
if (defined $session and exists $session->{vars}->{$opt->{value}}) {
$value = $session->{vars}->{$opt->{value}}
}
else {
$value = $variables->{$opt->{value}}
}
}
else {
$value = $opt->{value};
}
if ($flag) {
if ($flag =~ /\.*=/) { push @options, $flag.$value}
else {push @options, $flag, $value}
@@ -74,7 +82,7 @@ sub toggle_program {
else {
my (@options, @args) = $self->prepare_args($program->{args});
my $command = $self->find_binary($program);
print "starting $program->{name} [$command @options, @args]\n";
print "starting $program->{name} [$command @options @args]\n";
$program->{pid} = $self->SUPER::start_program($command, @options[0..$#options], @args[0..$#args]);
}
}
@@ -83,7 +91,7 @@ sub toggle_program_in_session {
my ($self, $session_name, $pgm_idx) = @_;
my $session = $self->get('-sessions')->{$session_name};
my $session_program = $session->{pgms}->[$pgm_idx];
# print "processing program in session context\n".Dumper($session_program);
print "processing program in session context\n".Dumper($session);
if (defined $session_program->{pid}) {
print "killing program $session_program->{name} => $session_program->{pid}\n";
$self->SUPER::stop_program($session_program->{pid});
@@ -93,7 +101,7 @@ sub toggle_program_in_session {
print "launching program\n";
my $program_name = $session_program->{name};
my $program = $self->get('-programs')->{$program_name};
my (@pgm_options, @pgm_args) = $self->prepare_args($program->{args});
my (@pgm_options, @pgm_args) = $self->prepare_args($program->{args}, $session);
my (@session_options, @session_args) = $self->prepare_args($session_program->{args});
push @pgm_options, @session_options;
push @pgm_args, @session_args;
@@ -146,7 +154,7 @@ sub xml_parse_section {
}
elsif ($section_name eq 'variables') {
$tmp->{$item->getAttribute('name')} = $item->getAttribute('value');
}
}
elsif ($section_name eq 'programs') {
my $pgm_name = $item->getAttribute('name');
my $args = $item->getElementsByTagName("arg");
@@ -170,9 +178,15 @@ sub xml_parse_section {
args => $args_h
};
}
my $session_vars = {};
my @xsession_vars = $item->getElementsByTagName("variable");
foreach my $session_var (@xsession_vars){
$session_vars->{$session_var->getAttribute('name')} = $session_var->getAttribute('value')
}
$tmp->{$session_name} = {
name => $session_name,
pgms => \@sessions_pgms
pgms => \@sessions_pgms,
vars => $session_vars,
};
}
}
sw/supervision/paparazzi.pl
+7 -6
View File
@@ -32,8 +32,9 @@ sub populate {
$args->{-bin_base_dir} = $paparazzi_src;
$args->{-logo_file} = $paparazzi_home."/data/pictures/penguin_logo.gif";
$self->SUPER::populate($args);
$self->configspec(-variables => [S_SUPER, S_SUPER, S_SUPER, S_SUPER, S_SUPER, undef]);
$self->configspec(-variables => [S_SUPER, S_SUPER, S_SUPER, S_SUPER, S_SUPER, {}]);
}
sub completeinit {
my ($self) = @_;
$self->SUPER::completeinit();
@@ -43,9 +44,9 @@ sub completeinit {
sub parse_args {
my ($self) = @_;
my $options = {
ivy_bus => "127.255.255.255:2005",
map => "muret_UTM.xml",
render => "1",
ivy_bus => undef,
map => undef,
render => undef,
};
GetOptions("b=s" => \$options->{ivy_bus},
"m=s" => \$options->{map},
@@ -53,9 +54,9 @@ sub parse_args {
);
my $variables = $self->get('-variables');
foreach my $var (keys %{$options}) {
$variables->{$var} = $options->{$var};
$variables->{$var} = $options->{$var} if defined $options->{$var};
}
$self->configure('-variables' => $variables);
print "in paparazzi::parse_args variables after\n".Dumper($variables);
}
sub catchSigTerm() {