ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Bug 327 - Invalidated shared memory id on any errors. 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1964 e3e1d417-86f3-4887-817a-d78f3d33393f
pull/27/merge
stan 2006-05-08 12:42:39 +00:00
parent fcb27ace30
commit 3db5b4538a
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/ZoneMinder/lib/ZoneMinder/SharedMem.pm
View File

@ -59,6 +59,7 @@ our %EXPORT_TAGS = (
'functions' => [ qw(
zmShmGet
zmShmVerify
zmShmInvalidate
zmShmRead
zmShmWrite
zmGetMonitorState
@ -277,6 +278,14 @@ sub zmShmVerify( $ )
return( !undef );
}
sub zmShmInvalidate( $ )
{
my $monitor = shift;
delete $monitor->{ShmId};
delete $shm_verified->{$monitor->{ShmKey}};
}
sub zmShmRead( $$;$ )
{
my $monitor = shift;
@ -309,6 +318,7 @@ sub zmShmRead( $$;$ )
if ( !shmread( $shm_id, $data, $offset, $size ) )
{
Error( sprintf( "Can't read '$field' from shared memory '%x/%d': $!", $shm_key, $shm_id ) );
zmShmInvalidate( $monitor );
return( undef );
}
@ -414,6 +424,7 @@ sub zmShmWrite( $$;$ )
if ( !shmwrite( $shm_id, $data, $offset, $size ) )
{
Error( sprintf( "Can't write '$value' to '$field' in shared memory '%x/%d': $!", $shm_key, $shm_id ) );
zmShmInvalidate( $monitor );
return( undef );
}
}
@ -665,6 +676,10 @@ All the methods listed below require a 'monitor' parameter. This must be a refer
Verify that the shared memory of the monitor given exists and is valid. It will return an undefined value if it is not valid. You should generally call this method first before using any of the other methods, but most of the remaining methods will also do so if the memory has not already been verified.
=item zmShmInvalidate ( $monitor );
Following an error, reset the shared memory ids and attempt to reverify on the next operation. This is mostly used when a shared memory segment has gone away and been recreated with a different id.
=item zmShmRead ( $monitor, $readspec );
This method is used to read data from shared memory attached to the given monitor. The shared memory will be verified if it has not already been. The 'readspec' must either be a string of the form "<section>:<field>" or a reference to an array of strings of the same format. In the first case a single value is returned, in the latter case a list of values is return. Errors will cause undefined to be returned. The allowable sections and field names are described below.