Merge branch 'nommap'

src/zm_monitor.cpp

@@ -373,63 +373,11 @@ Monitor::Monitor(
              + 64; /* Padding used to permit aligning the images buffer to 16 byte boundary */
 
     Debug( 1, "mem.size=%d", mem_size );
-#if ZM_MEM_MAPPED
+	mem_ptr = NULL;
-    snprintf( mem_file, sizeof(mem_file), "%s/zm.mmap.%d", config.path_map, id );
-    map_fd = open( mem_file, O_RDWR|O_CREAT, (mode_t)0600 );
-    if ( map_fd < 0 )
-        Fatal( "Can't open memory map file %s, probably not enough space free: %s", mem_file, strerror(errno) );
-        struct stat map_stat;
-    if ( fstat( map_fd, &map_stat ) < 0 )
-        Fatal( "Can't stat memory map file %s: %s", mem_file, strerror(errno) );
-    if ( map_stat.st_size != mem_size && purpose == CAPTURE )
-    {
-        // Allocate the size
-        if ( ftruncate( map_fd, mem_size ) < 0 )
-            Fatal( "Can't extend memory map file %s to %d bytes: %s", mem_file, mem_size, strerror(errno) );
-    }
-    else if ( map_stat.st_size != mem_size )
-    {
-        Error( "Got unexpected memory map file size %ld, expected %d", map_stat.st_size, mem_size );
-    }
 
-    mem_ptr = (unsigned char *)mmap( NULL, mem_size, PROT_READ|PROT_WRITE, MAP_SHARED|MAP_LOCKED, map_fd, 0 );
+    if ( purpose == CAPTURE ) {
-    if ( mem_ptr == MAP_FAILED )
+		this->connect();
-        if ( errno == EAGAIN )
+		if ( ! mem_ptr ) exit(-1);
-        {
-            Debug( 1, "Unable to map file %s (%d bytes) to locked memory, trying unlocked", mem_file, mem_size );
-            mem_ptr = (unsigned char *)mmap( NULL, mem_size, PROT_READ|PROT_WRITE, MAP_SHARED, map_fd, 0 );
-        }
-    if ( mem_ptr == MAP_FAILED )
-        Fatal( "Can't map file %s (%d bytes) to memory: %s(%d)", mem_file, mem_size, strerror(errno), errno );
-#else // ZM_MEM_MAPPED
-    shm_id = shmget( (config.shm_key&0xffff0000)|id, mem_size, IPC_CREAT|0700 );
-    if ( shm_id < 0 )
-    {
-        Error( "Can't shmget, probably not enough shared memory space free: %s", strerror(errno));
-        exit( -1 );
-    }
-    mem_ptr = (unsigned char *)shmat( shm_id, 0, 0 );
-    if ( mem_ptr < 0 )
-    {
-        Error( "Can't shmat: %s", strerror(errno));
-        exit( -1 );
-    }
-#endif // ZM_MEM_MAPPED
-
-    shared_data = (SharedData *)mem_ptr;
-    trigger_data = (TriggerData *)((char *)shared_data + sizeof(SharedData));
-    struct timeval *shared_timestamps = (struct timeval *)((char *)trigger_data + sizeof(TriggerData));
-    unsigned char *shared_images = (unsigned char *)((char *)shared_timestamps + (image_buffer_count*sizeof(struct timeval)));
-    
-    if(((unsigned long)shared_images % 16) != 0) {
-	/* Align images buffer to nearest 16 byte boundary */
-	Debug(3,"Aligning shared memory images to the next 16 byte boundary");
-	shared_images = (uint8_t*)((unsigned long)shared_images + (16 - ((unsigned long)shared_images % 16)));
-    }
-    
-
-    if ( purpose == CAPTURE )
-    {
         memset( mem_ptr, 0, mem_size );
         shared_data->size = sizeof(SharedData);
         shared_data->active = enabled;
@@ -455,17 +403,16 @@ Monitor::Monitor(
         trigger_data->trigger_text[0] = 0;
         trigger_data->trigger_showtext[0] = 0;
         shared_data->valid = true;
-    }
+    } else if ( purpose == ANALYSIS ) {
-    else if ( purpose == ANALYSIS )
+		this->connect();
-    {
+		if ( ! mem_ptr ) exit(-1);
         shared_data->state = IDLE;
         shared_data->last_read_time = 0;
         shared_data->alarm_x = -1;
         shared_data->alarm_y = -1;
-
     }
 
-    if ( !shared_data->valid )
+    if ( ( ! mem_ptr ) || ! shared_data->valid )
     {
         if ( purpose != QUERY )
         {
@@ -478,22 +425,8 @@ Monitor::Monitor(
         }
     }
 
-    image_buffer = new Snapshot[image_buffer_count];
+    if ( !n_zones ) {
-    for ( int i = 0; i < image_buffer_count; i++ )
+		Debug( 1, "Monitor %s has no zones, adding one.", name );
-    {
-        image_buffer[i].timestamp = &(shared_timestamps[i]);
-        image_buffer[i].image = new Image( width, height, camera->Colours(), camera->SubpixelOrder(), &(shared_images[i*camera->ImageSize()]) );
-        image_buffer[i].image->HoldBuffer(true); /* Don't release the internal buffer or replace it with another */
-    }
-    if ( (deinterlacing & 0xff) == 4)
-    {
-        /* Four field motion adaptive deinterlacing in use */
-        /* Allocate a buffer for the next image */
-        next_buffer.image = new Image( width, height, camera->Colours(), camera->SubpixelOrder());
-        next_buffer.timestamp = new struct timeval;
-    }
-    if ( !n_zones )
-    {
         n_zones = 1;
         zones = new Zone *[1];
         Coord coords[4] = { Coord( 0, 0 ), Coord( width-1, 0 ), Coord( width-1, height-1 ), Coord( 0, height-1 ) };
@@ -558,8 +491,79 @@ Monitor::Monitor(
     }
 }
 
+bool Monitor::connect() {
+#if ZM_MEM_MAPPED
+    snprintf( mem_file, sizeof(mem_file), "%s/zm.mmap.%d", config.path_map, id );
+    map_fd = open( mem_file, O_RDWR|O_CREAT, (mode_t)0600 );
+    if ( map_fd < 0 )
+        Fatal( "Can't open memory map file %s, probably not enough space free: %s", mem_file, strerror(errno) );
+
+    struct stat map_stat;
+    if ( fstat( map_fd, &map_stat ) < 0 )
+        Fatal( "Can't stat memory map file %s: %s", mem_file, strerror(errno) );
+    if ( map_stat.st_size != mem_size && purpose == CAPTURE ) {
+        // Allocate the size
+        if ( ftruncate( map_fd, mem_size ) < 0 ) {
+            Fatal( "Can't extend memory map file %s to %d bytes: %s", mem_file, mem_size, strerror(errno) );
+		}
+    } else if ( map_stat.st_size != mem_size ) {
+        Error( "Got unexpected memory map file size %ld, expected %d", map_stat.st_size, mem_size );
+		return false;
+	} else {
+		mem_ptr = (unsigned char *)mmap( NULL, mem_size, PROT_READ|PROT_WRITE, MAP_SHARED|MAP_LOCKED, map_fd, 0 );
+		if ( mem_ptr == MAP_FAILED ) {
+			if ( errno == EAGAIN ) {
+				Debug( 1, "Unable to map file %s (%d bytes) to locked memory, trying unlocked", mem_file, mem_size );
+				mem_ptr = (unsigned char *)mmap( NULL, mem_size, PROT_READ|PROT_WRITE, MAP_SHARED, map_fd, 0 );
+				Debug( 1, "Mapped file %s (%d bytes) to locked memory, unlocked", mem_file, mem_size );
+			}
+		}
+		if ( mem_ptr == MAP_FAILED )
+			Fatal( "Can't map file %s (%d bytes) to memory: %s(%d)", mem_file, mem_size, strerror(errno), errno );
+    }
+#else // ZM_MEM_MAPPED
+    shm_id = shmget( (config.shm_key&0xffff0000)|id, mem_size, IPC_CREAT|0700 );
+    if ( shm_id < 0 ) {
+        Error( "Can't shmget, probably not enough shared memory space free: %s", strerror(errno));
+        exit( -1 );
+    }
+    mem_ptr = (unsigned char *)shmat( shm_id, 0, 0 );
+    if ( mem_ptr < 0 )
+    {
+        Error( "Can't shmat: %s", strerror(errno));
+        exit( -1 );
+    }
+#endif // ZM_MEM_MAPPED
+    shared_data = (SharedData *)mem_ptr;
+    trigger_data = (TriggerData *)((char *)shared_data + sizeof(SharedData));
+    struct timeval *shared_timestamps = (struct timeval *)((char *)trigger_data + sizeof(TriggerData));
+    unsigned char *shared_images = (unsigned char *)((char *)shared_timestamps + (image_buffer_count*sizeof(struct timeval)));
+    
+    if(((unsigned long)shared_images % 16) != 0) {
+		/* Align images buffer to nearest 16 byte boundary */
+		Debug(3,"Aligning shared memory images to the next 16 byte boundary");
+		shared_images = (uint8_t*)((unsigned long)shared_images + (16 - ((unsigned long)shared_images % 16)));
+    }
+    image_buffer = new Snapshot[image_buffer_count];
+    for ( int i = 0; i < image_buffer_count; i++ )
+    {
+        image_buffer[i].timestamp = &(shared_timestamps[i]);
+        image_buffer[i].image = new Image( width, height, camera->Colours(), camera->SubpixelOrder(), &(shared_images[i*camera->ImageSize()]) );
+        image_buffer[i].image->HoldBuffer(true); /* Don't release the internal buffer or replace it with another */
+    }
+    if ( (deinterlacing & 0xff) == 4)
+    {
+        /* Four field motion adaptive deinterlacing in use */
+        /* Allocate a buffer for the next image */
+        next_buffer.image = new Image( width, height, camera->Colours(), camera->SubpixelOrder());
+        next_buffer.timestamp = new struct timeval;
+    }
+	return true;
+}
+
 Monitor::~Monitor()
 {
+	if ( mem_ptr ) {
 		if ( event )
 			Info( "%s: %03d - Closing event %d, shutting down", name, image_count, event->Id() );
 		closeEvent();
@@ -575,6 +579,8 @@ Monitor::~Monitor()
 		}
 		delete[] image_buffer;
 
+	} // end if mem_ptr
+
     for ( int i = 0; i < n_zones; i++ )
     {
         delete zones[i];
@@ -595,6 +601,7 @@ Monitor::~Monitor()
         memset( mem_ptr, 0, mem_size );
     }
 
+	if ( mem_ptr ) {
 #if ZM_MEM_MAPPED
 		if ( msync( mem_ptr, mem_size, MS_SYNC ) < 0 )
 			Error( "Can't msync: %s", strerror(errno) );
@@ -603,20 +610,18 @@ Monitor::~Monitor()
 		close( map_fd );
 #else // ZM_MEM_MAPPED
 		struct shmid_ds shm_data;
-    if ( shmctl( shm_id, IPC_STAT, &shm_data ) < 0 )
+		if ( shmctl( shm_id, IPC_STAT, &shm_data ) < 0 ) {
-    {
 			Error( "Can't shmctl: %s", strerror(errno) );
 			exit( -1 );
 		}
-    if ( shm_data.shm_nattch <= 1 )
+		if ( shm_data.shm_nattch <= 1 ) {
-    {
+			if ( shmctl( shm_id, IPC_RMID, 0 ) < 0 ) {
-        if ( shmctl( shm_id, IPC_RMID, 0 ) < 0 )
-        {
 				Error( "Can't shmctl: %s", strerror(errno) );
 				exit( -1 );
 			}
 		}
 #endif // ZM_MEM_MAPPED
+	} // end if mem_ptr
 }
 
 void Monitor::AddZones( int p_n_zones, Zone *p_zones[] )

src/zm_monitor.h

@@ -298,6 +298,7 @@ public:
 
 	void AddZones( int p_n_zones, Zone *p_zones[] );
 
+	bool connect();
 	inline int ShmValid() const
 	{
 		return( shared_data->valid );

src/zm_stream.cpp

@@ -44,6 +44,7 @@ bool StreamBase::loadMonitor( int monitor_id )
         Fatal( "Unable to load monitor id %d for streaming", monitor_id );
         return( false );
     }
+	monitor->connect();
     return( true );
 }