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

Added proper getopt options, added usage and broke out into one daemon per monitor. 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@215 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2002-12-24 12:01:28 +00:00
parent 298d82e090
commit 4541b32d20
1 changed files with 92 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
src/zma.cpp
View File

@ -17,6 +17,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// //
#include <getopt.h>
#include "zm.h" #include "zm.h"
bool reload = false; bool reload = false;
@ -39,12 +40,70 @@ void term_handler( int signal )
exit( 0 ); exit( 0 );
} }
int main( int argc, const char *argv[] ) void Usage()
{ {
int device = argv[1]?atoi( argv[1] ):0; fprintf( stderr, "zma -m <monitor_id>\n" );
fprintf( stderr, "Options:\n" );
fprintf( stderr, " -m, --monitor <monitor_id> : Specify which monitor to use\n" );
fprintf( stderr, " -h, --help : This screen\n" );
exit( 0 );
}
int main( int argc, char *argv[] )
{
int id = -1;
static struct option long_options[] = {
{"monitor", 1, 0, 'm'},
{"help", 0, 0, 'h'},
{0, 0, 0, 0}
};
while (1)
{
int this_option_optind = optind ? optind : 1;
int option_index = 0;
int opterr = 1;
int c = getopt_long (argc, argv, "m:h", long_options, &option_index);
if (c == -1)
{
break;
}
switch (c)
{
case 'm':
id = atoi(optarg);
break;
case 'h':
case '?':
Usage();
break;
default:
//fprintf( stderr, "?? getopt returned character code 0%o ??\n", c );
break;
}
}
if (optind < argc)
{
fprintf( stderr, "Extraneous options, " );
while (optind < argc)
printf ("%s ", argv[optind++]);
printf ("\n");
Usage();
}
if ( id < 0 )
{
fprintf( stderr, "Bogus monitor %d\n", id );
Usage();
exit( 0 );
}
char dbg_name_string[16]; char dbg_name_string[16];
sprintf( dbg_name_string, "zma-%d", device ); sprintf( dbg_name_string, "zma-m%d", id );
dbg_name = dbg_name_string; dbg_name = dbg_name_string;
DbgInit(); DbgInit();
@ -65,20 +124,16 @@ int main( int argc, const char *argv[] )
exit( mysql_errno( &dbconn ) ); exit( mysql_errno( &dbconn ) );
} }
Monitor **monitors = 0; Monitor *monitor = Monitor::Load( id, true );
int n_monitors = Monitor::Load( device, monitors, false );
if ( monitor )
{
Info(( "Warming up" )); Info(( "Warming up" ));
sigset_t block_set; sigset_t block_set;
sigemptyset( &block_set ); sigemptyset( &block_set );
struct sigaction action, old_action; struct sigaction action, old_action;
action.sa_handler = hup_handler;
action.sa_mask = block_set;
action.sa_flags = 0;
sigaction( SIGHUP, &action, &old_action );
action.sa_handler = term_handler; action.sa_handler = term_handler;
action.sa_mask = block_set; action.sa_mask = block_set;
action.sa_flags = 0; action.sa_flags = 0;
@ -90,34 +145,21 @@ int main( int argc, const char *argv[] )
sigaction( SIGBUS, &action, &old_action ); sigaction( SIGBUS, &action, &old_action );
sigaction( SIGSEGV, &action, &old_action ); sigaction( SIGSEGV, &action, &old_action );
sigaddset( &block_set, SIGHUP );
//sigaddset( &block_set, SIGTERM );
while( 1 ) while( 1 )
{ {
// Process the next image // Process the next image
bool result = false; bool result = false;
sigprocmask( SIG_BLOCK, &block_set, 0 ); sigprocmask( SIG_BLOCK, &block_set, 0 );
for ( int i = 0; i < n_monitors; i++ ) if ( !monitor->Analyse() )
{
if ( monitors[i]->Analyse() )
{
result = true;
}
}
if ( !result )
{ {
usleep( 10000 ); usleep( 10000 );
} }
sigprocmask( SIG_UNBLOCK, &block_set, 0 ); sigprocmask( SIG_UNBLOCK, &block_set, 0 );
if ( reload )
{
for ( int i = 0; i < n_monitors; i++ )
{
monitors[i]->ReloadZones();
monitors[i]->CheckFunction();
} }
reload = false;
} }
else
{
fprintf( stderr, "Can't find monitor with id of %d\n", id );
} }
return( 0 ); return( 0 );
} }