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

remove the verified caching. It makes calling zmMemVerify useless.

This commit is contained in:
Isaac Connor 2017-01-12 13:02:16 -05:00
parent 7502b81064
commit 513cd68c20
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
View File

@ -180,7 +180,6 @@ our $mem_data = {
}; };
our $mem_size = 0; our $mem_size = 0;
our $mem_verified = {};
sub zmMemInit { sub zmMemInit {
my $offset = 0; my $offset = 0;
@ -249,8 +248,6 @@ sub zmMemVerify {
return( undef ); return( undef );
} }
my $mem_key = zmMemKey( $monitor );
if ( !defined($mem_verified->{$mem_key}) ) {
my $sd_size = zmMemRead( $monitor, "shared_data:size", 1 ); my $sd_size = zmMemRead( $monitor, "shared_data:size", 1 );
if ( $sd_size != $mem_data->{shared_data}->{size} ) { if ( $sd_size != $mem_data->{shared_data}->{size} ) {
if ( $sd_size ) { if ( $sd_size ) {
@ -295,12 +292,8 @@ sub zmMemVerify {
if ( !zmMemRead($monitor, "shared_data:valid",1) ) { if ( !zmMemRead($monitor, "shared_data:valid",1) ) {
Error( "Shared data not valid for monitor $$monitor{Id}" ); Error( "Shared data not valid for monitor $$monitor{Id}" );
return( undef ); return( undef );
} else {
Debug( "Shared data valid for monitor $$monitor{Id}" );
} }
$mem_verified->{$mem_key} = !undef;
}
return( !undef ); return( !undef );
} }
@ -373,7 +366,6 @@ sub zmMemInvalidate {
my $monitor = shift; my $monitor = shift;
my $mem_key = zmMemKey($monitor); my $mem_key = zmMemKey($monitor);
if ( $mem_key ) { if ( $mem_key ) {
delete $mem_verified->{$mem_key};
zmMemDetach( $monitor ); zmMemDetach( $monitor );
} }
} }