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

Merge pull request #2307 from connortechnology/fix_32bit_alignment 

remove epadding2, to restore the 64bit alignment of startup_time.
This commit is contained in:
Andrew Bauer 2018-11-13 13:38:53 -06:00 committed by GitHub
parent 07d6d799ce 31b0ed107d
commit 8b50c87aab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -161,7 +161,6 @@ our $mem_data = {
format => { type=>'uint8', seq=>$mem_seq++ }, format => { type=>'uint8', seq=>$mem_seq++ },
imagesize => { type=>'uint32', seq=>$mem_seq++ }, imagesize => { type=>'uint32', seq=>$mem_seq++ },
epadding1 => { type=>'uint32', seq=>$mem_seq++ }, epadding1 => { type=>'uint32', seq=>$mem_seq++ },
epadding2 => { type=>'uint32', seq=>$mem_seq++ },
startup_time => { type=>'time_t64', seq=>$mem_seq++ }, startup_time => { type=>'time_t64', seq=>$mem_seq++ },
last_write_time => { type=>'time_t64', seq=>$mem_seq++ }, last_write_time => { type=>'time_t64', seq=>$mem_seq++ },
last_read_time => { type=>'time_t64', seq=>$mem_seq++ }, last_read_time => { type=>'time_t64', seq=>$mem_seq++ },

11
src/zm_monitor.h
View File

@ -127,24 +127,25 @@ protected:
uint8_t format; /* +55 */ uint8_t format; /* +55 */
uint32_t imagesize; /* +56 */ uint32_t imagesize; /* +56 */
uint32_t epadding1; /* +60 */ uint32_t epadding1; /* +60 */
uint32_t epadding2; /* +64 */
/* /*
** This keeps 32bit time_t and 64bit time_t identical and compatible as long as time is before 2038. ** This keeps 32bit time_t and 64bit time_t identical and compatible as long as time is before 2038.
** Shared memory layout should be identical for both 32bit and 64bit and is multiples of 16. ** Shared memory layout should be identical for both 32bit and 64bit and is multiples of 16.
** Because startup_time is 64bit it may be aligned to a 64bit boundary. So it's offset SHOULD be a multiple
** of 8. Add or delete epadding's to achieve this.
*/ */
union { /* +68 */ union { /* +64 */
time_t startup_time; /* When the zmc process started. zmwatch uses this to see how long the process has been running without getting any images */ time_t startup_time; /* When the zmc process started. zmwatch uses this to see how long the process has been running without getting any images */
uint64_t extrapad1; uint64_t extrapad1;
}; };
union { /* +76 */ union { /* +72 */
time_t last_write_time; time_t last_write_time;
uint64_t extrapad2; uint64_t extrapad2;
}; };
union { /* +84 */ union { /* +80 */
time_t last_read_time; time_t last_read_time;
uint64_t extrapad3; uint64_t extrapad3;
}; };
uint8_t control_state[256]; /* +92 */ uint8_t control_state[256]; /* +88 */
char alarm_cause[256]; char alarm_cause[256];