Converted to new shared memory calls.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1737 e3e1d417-86f3-4887-817a-d78f3d33393fpull/27/merge
parent
abdfaaed80
commit
e662a25619
|
@ -87,37 +87,14 @@ while( 1 )
|
||||||
{
|
{
|
||||||
my $now = time();
|
my $now = time();
|
||||||
my $res = $sth->execute() or die( "Can't execute: ".$sth->errstr() );
|
my $res = $sth->execute() or die( "Can't execute: ".$sth->errstr() );
|
||||||
my $shm_size = 24; # We only need the first 24 bytes really for the last event time
|
|
||||||
while( my $monitor = $sth->fetchrow_hashref() )
|
while( my $monitor = $sth->fetchrow_hashref() )
|
||||||
{
|
{
|
||||||
if ( $monitor->{Function} ne 'None' )
|
if ( $monitor->{Function} ne 'None' )
|
||||||
{
|
{
|
||||||
# Check we have got an image recently
|
# Check we have got an image recently
|
||||||
$monitor->{ShmKey} = hex(ZM_SHM_KEY)|$monitor->{Id};
|
my $image_time = zmGetLastImageTime( $monitor );
|
||||||
$monitor->{ShmId} = shmget( $monitor->{ShmKey}, $shm_size, 0 );
|
next if ( !defined($image_time) ); # Can't read from shared memory
|
||||||
if ( !defined($monitor->{ShmId}) )
|
next if ( !$image_time ); # We can't get the last capture time so can't be sure it's died.
|
||||||
{
|
|
||||||
Error( "Can't get shared memory id '$monitor->{ShmKey}': $!\n" );
|
|
||||||
next;
|
|
||||||
}
|
|
||||||
my $image_time;
|
|
||||||
if ( !shmread( $monitor->{ShmId}, $image_time, 20, 4 ) )
|
|
||||||
{
|
|
||||||
Error( "Can't read from shared memory '$monitor->{ShmKey}/$monitor->{ShmId}': $!\n" );
|
|
||||||
next;
|
|
||||||
}
|
|
||||||
$image_time = unpack( "l", $image_time );
|
|
||||||
|
|
||||||
#my $command = ZM_PATH_BIN."/zmu -m ".$monitor->{Id}." -t";
|
|
||||||
#Debug( "Getting last image time for monitor $monitor->{Id} ('$command')\n" );
|
|
||||||
#my $image_time = qx( $command );
|
|
||||||
#chomp($image_time);
|
|
||||||
|
|
||||||
if ( !$image_time )
|
|
||||||
{
|
|
||||||
# We can't get the last capture time so can't be sure it's died.
|
|
||||||
next;
|
|
||||||
}
|
|
||||||
|
|
||||||
my $max_image_delay = (($monitor->{MaxFPS}>0)&&($monitor->{MaxFPS}<1))?(3/$monitor->{MaxFPS}):ZM_WATCH_MAX_DELAY;
|
my $max_image_delay = (($monitor->{MaxFPS}>0)&&($monitor->{MaxFPS}<1))?(3/$monitor->{MaxFPS}):ZM_WATCH_MAX_DELAY;
|
||||||
my $image_delay = $now-$image_time;
|
my $image_delay = $now-$image_time;
|
||||||
|
|
Loading…
Reference in New Issue