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

Merge pull request #5 from ZoneMinder/master 

merge upstream master
pull/1670/head
Isaac Connor 2016-11-04 14:35:58 -04:00 committed by GitHub
parent bd47439056 ae1abe99ab
commit 8a6a8fab5b
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
docs/faq.rst
View File

@ -96,22 +96,16 @@ A sample output on Ubuntu:
::
pp@camerapc:~$ df -h
pp@camerapc:~$ df -h|grep "Filesystem\|shm"
Filesystem Size Used Avail Use% Mounted on
/dev/sda1 226G 96G 119G 45% /
none 4.0K 0 4.0K 0% /sys/fs/cgroup
udev 1.8G 4.0K 1.8G 1% /dev
tmpfs 371M 816K 370M 1% /run
none 5.0M 0 5.0M 0% /run/lock
tmpfs 2.6G 923M 1.7G 36% /run/shm
none 100M 0 100M 0% /run/user
The key item here is tmpfs --> the example above shows we have allocated 1.7G of mapped memory space of which 36% is used which is a healthy number. If you are seeing this to go beyond 70% you should probaby increase mapped memory
The key item here is tmpfs --> the example above shows we have allocated 1.7G of mapped memory space of which 36% is used which is a healthy number. If you are seeing ``Use%`` going beyond 70% you should probaby increase the mapped memory.
If you want to increase this limit to 70% of your memory, add the following to ``/etc/fstab``
``tmpfs /run/shm tmpfs defaults,noexec,nosuid,size=70% 0 0``
For example, if you want to increase this limit to 70% of your memory, add the following to ``/etc/fstab``
``tmpfs SHMPATH tmpfs defaults,noexec,nosuid,size=70% 0 0``
where SHMPATH is the ``Mounted on`` path. Here, that would be ``/run/shm``. Other systems may be ``/dev/shm``.
What does a 'Can't shmget: Invalid argument' error in my logs mean? (and my camera does not display at higher resolutions)

2
docs/userguide/definezone.rst
View File

@ -56,7 +56,7 @@ Alarm Colour
These parameters can be used to individually colorize the zone overlay pattern. Alarms in this zone will be highlighted in the alarm colour. This option is irrelevant for Preclusive and Inactive zones and will be disabled.
Alarm Check Methods
There are 3 Alarm Check Methods. They are sequential, and are layered: In AlarmedPixels mode, only the AlarmedPixel analysis is performed. In FilteredPixels mode, the AlarmedPixel analysis is performed first, followed by the AlarmedPixel analysis. In the Blobs mode, all 3 analysis methods are performed in order. An alarm is only triggered if *all* of the enabled analysis modes are triggered. For performance reasons, as soon as the criteria for one of the analysis modes is not met, the alarm checking for the frame is complete. Since the subsequent modes each require progressively more computations, it is a good idea to tune the parameters in each of the activated layers.
There are 3 Alarm Check Methods. They are sequential, and are layered: In AlarmedPixels mode, only the AlarmedPixel analysis is performed. In FilteredPixels mode, the AlarmedPixel analysis is performed first, followed by the FilteredPixel analysis. In the Blobs mode, all 3 analysis methods are performed in order. An alarm is only triggered if *all* of the enabled analysis modes are triggered. For performance reasons, as soon as the criteria for one of the analysis modes is not met, the alarm checking for the frame is complete. Since the subsequent modes each require progressively more computations, it is a good idea to tune the parameters in each of the activated layers.
For reference purposes, the Zone Area box shows the area of the entire region of interest. In percent mode, this is 100. In Pixels mode, this is the pixel count of the region. All 3 Min/Max Area parameter groups are based on the Zone Area as the maximum sensible value, and all 3 are interpreted in the units specified in the Units input.