ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed to write to shared memory directly and fixed pending task list bug. 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@603 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2003-07-05 15:52:00 +00:00
parent 0cc41ddcc5
commit 4b8c56dee6
1 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
scripts/zmx10.pl.z
View File

@ -163,6 +163,7 @@ use POSIX;
use DBI; use DBI;
use Socket; use Socket;
use X10::ActiveHome; use X10::ActiveHome;
use Data::Dumper;
our $dbh; our $dbh;
our $x10; our $x10;
@ -324,12 +325,12 @@ sub runServer
my $task_list; my $task_list;
if ( $state == 1 && $monitor->{LastState} == 0 ) # Gone into alarm state if ( $state == 1 && $monitor->{LastState} == 0 ) # Gone into alarm state
{ {
print( "Applying ON_list\n" ) if ( main::VERBOSE ); print( "Applying ON_list for $monitor_id\n" ) if ( main::VERBOSE );
$task_list = $monitor->{"ON_list"}; $task_list = $monitor->{"ON_list"};
} }
elsif ( $state == 0 && $monitor->{LastState} > 0 ) # Come out of alarm state elsif ( $state == 0 && $monitor->{LastState} > 0 ) # Come out of alarm state
{ {
print( "Applying OFF_list\n" ) if ( main::VERBOSE ); print( "Applying OFF_list for $monitor_id\n" ) if ( main::VERBOSE );
$task_list = $monitor->{"OFF_list"}; $task_list = $monitor->{"OFF_list"};
} }
if ( $task_list ) if ( $task_list )
@ -384,7 +385,7 @@ sub addToDeviceList
$device = $device_hash{$unit_code} = { appliance=>$x10->Appliance( unit_code=>$unit_code ), status=>'unknown' }; $device = $device_hash{$unit_code} = { appliance=>$x10->Appliance( unit_code=>$unit_code ), status=>'unknown' };
} }
my $task = { type=>"device", monitor=>$monitor->{Id}, function=>$function }; my $task = { type=>"device", monitor=>$monitor, function=>$function };
if ( $limit ) if ( $limit )
{ {
$task->{limit} = $limit $task->{limit} = $limit
@ -536,10 +537,14 @@ sub addPendingTask
my $new_pending_list = []; my $new_pending_list = [];
foreach my $pending_task ( @$pending_list ) foreach my $pending_task ( @$pending_list )
{ {
if ( $task->{type} eq "device" ) if ( $task->{type} ne $pending_task->{type} )
{
push( @$new_pending_list, $pending_task )
}
elsif ( $task->{type} eq "device" )
{ {
if (( $task->{monitor}->{Id} != $pending_task->{monitor}->{Id} ) if (( $task->{monitor}->{Id} != $pending_task->{monitor}->{Id} )
|| ( $task->{function} != $pending_task->{function} )) || ( $task->{function} ne $pending_task->{function} ))
{ {
push( @$new_pending_list, $pending_task ) push( @$new_pending_list, $pending_task )
} }
@ -547,7 +552,7 @@ sub addPendingTask
elsif ( $task->{type} eq "monitor" ) elsif ( $task->{type} eq "monitor" )
{ {
if (( $task->{device}->{appliance}->unit_code() != $pending_task->{device}->{appliance}->unit_code() ) if (( $task->{device}->{appliance}->unit_code() != $pending_task->{device}->{appliance}->unit_code() )
|| ( $task->{function} != $pending_task->{function} )) || ( $task->{function} ne $pending_task->{function} ))
{ {
push( @$new_pending_list, $pending_task ) push( @$new_pending_list, $pending_task )
} }
@ -596,7 +601,7 @@ sub processTask
{ {
if ( $instruction eq "start" ) if ( $instruction eq "start" )
{ {
$command = main::ZM_PATH_BIN."/zmdc.pl start zma -m ".$task->{monitor}; $command = main::ZM_PATH_BIN."/zmdc.pl start zma -m ".$task->{monitor}->{Id};
if ( $task->{limit} ) if ( $task->{limit} )
{ {
addPendingTask( $task ); addPendingTask( $task );
@ -604,14 +609,19 @@ sub processTask
} }
elsif( $instruction eq "stop" ) elsif( $instruction eq "stop" )
{ {
$command = main::ZM_PATH_BIN."/zmdc.pl stop zma -m ".$task->{monitor}; $command = main::ZM_PATH_BIN."/zmdc.pl stop zma -m ".$task->{monitor}->{Id};
} }
} }
elsif( $class eq "alarm" ) elsif( $class eq "alarm" )
{ {
if ( $instruction eq "start" ) if ( $instruction eq "start" )
{ {
$command = main::ZM_PATH_BIN."/zmu --monitor ".$task->{monitor}." --alarm"; #$command = main::ZM_PATH_BIN."/zmu --monitor ".$task->{monitor}->{Id}." --alarm";
my $force_alarm = pack( "l", 1 );
if ( !shmwrite( $task->{monitor}->{ShmId}, $force_alarm, 8, 4 ) )
{
print( "Can't write to shared memory: $!\n" );
}
if ( $task->{limit} ) if ( $task->{limit} )
{ {
addPendingTask( $task ); addPendingTask( $task );
@ -619,12 +629,17 @@ sub processTask
} }
elsif( $instruction eq "stop" ) elsif( $instruction eq "stop" )
{ {
$command = main::ZM_PATH_BIN."/zmu --monitor ".$task->{monitor}." --cancel"; #$command = main::ZM_PATH_BIN."/zmu --monitor ".$task->{monitor}->{Id}." --cancel";
my $force_alarm = pack( "l", 0 );
if ( !shmwrite( $task->{monitor}->{ShmId}, $force_alarm, 8, 4 ) )
{
print( "Can't write to shared memory: $!\n" );
}
} }
} }
print( "Executing command '$command'\n" );
if ( $command ) if ( $command )
{ {
print( "Executing command '$command'\n" );
qx( $command ); qx( $command );
} }
} }