Remove zmf, die..die..die

docs/faq.rst

@@ -309,7 +309,7 @@ The main causes are.
 	* Capture frame rates. Unless there's a compelling reason in your case there is often little benefit in running cameras at 25fps when 5-10fps would often get you results just as good. Try changing your monitor settings to limit your cameras to lower frame rates. You can still configure ZM to ignore these limits and capture as fast as possible when motion is detected.
 	* Run function. Obviously running in Record or Mocord modes or in Modect with lots of events generates a lot of DB and file activity and so CPU and load will increase.
 	*  Basic default detection zones. By default when a camera is added one detection zone is added which covers the whole image with a default set of parameters. If your camera covers a view in which various regions are unlikely to generate a valid alarm (ie the sky) then I would experiment with reducing the zone sizes or adding inactive zones to blank out areas you don't want to monitor. Additionally the actual settings of the zone themselves may not be optimal. When doing motion detection the number of changed pixels above a threshold is examined, then this is filter, then contiguous regions are calculated to see if an alarm is generated. If any maximum or minimum threshold is exceeded according to your zone settings at any time the calculation stops. If your settings always result in the calculations going through to the last stage before being failed then additional CPU time is used unnecessarily. Make sure your maximum and minimumzone thresholds are set to sensible values and experiment by switching RECORD_EVENT_STATS on and seeing what the actual values of alarmed pixels etc are during sample events.
-	* Optimise your settings. After you've got some settings you're happy with then switching off RECORD_EVENT_STATS will prevent the statistics being written to the database which saves some time. Other settings which might make a difference are ZM_FAST_RGB_DIFFS, ZM_OPT_FRAME_SERVER and the JPEG_xxx_QUALITY ones.
+	* Optimise your settings. After you've got some settings you're happy with then switching off RECORD_EVENT_STATS will prevent the statistics being written to the database which saves some time. Other settings which might make a difference are ZM_FAST_RGB_DIFFS and the JPEG_xxx_QUALITY ones.
 
 I'm sure there are other things which might make a difference such as what else you have running on the box and memory sizes (make sure there's no swapping going on). Also speed of disk etc will make some difference during event capture and also if you are watching the whole time then you may have a bunch of zms processes running also.
 

docs/userguide/options/options_system.rst

@@ -33,10 +33,6 @@ RUN_AUDIT - The zmaudit daemon exists to check that the saved information in the
 
 AUDIT_CHECK_INTERVAL - The zmaudit daemon exists to check that the saved information in the database and on the filesystem match and are consistent with each other. If an error occurs or if you are using 'fast deletes' it may be that database records are deleted but files remain. In this case, and similar, zmaudit will remove redundant information to synchronise the two data stores. The default check interval of 900 seconds (15 minutes) is fine for most systems however if you have a very large number of events the process of scanning the database and filesystem may take a long time and impact performance. In this case you may prefer to make this interval much larger to reduce the impact on your system. This option determines how often these checks are performed.
 
-OPT_FRAME_SERVER - In some circumstances it is possible for a slow disk to take so long writing images to disk that it causes the analysis daemon to fall behind especially during high frame rate events. Setting this option to yes enables a frame server daemon (zmf) which will be sent the images from the analysis daemon and will do the actual writing of images itself freeing up the analysis daemon to get on with other things. Should this transmission fail or other permanent or transient error occur, this function will fall back to the analysis daemon.
-
-FRAME_SOCKET_SIZE - For large captured images it is possible for the writes from the analysis daemon to the frame server to fail as the amount to be written exceeds the default buffer size. While the images are then written by the analysis daemon so no data is lost, it defeats the object of the frame server daemon in the first place. You can use this option to indicate that a larger buffer size should be used. Note that you may have to change the existing maximum socket buffer size on your system via sysctl (or in /proc/sys/net/core/wmem_max) to allow this new size to be set. Alternatively you can change the default buffer size on your system in the same way in which case that will be used with no change necessary in this option
-
 OPT_CONTROL - ZoneMinder includes limited support for controllable cameras. A number of sample protocols are included and others can easily be added. If you wish to control your cameras via ZoneMinder then select this option otherwise if you only have static cameras or use other control methods then leave this option off.
 
 OPT_TRIGGERS - ZoneMinder can interact with external systems which prompt or cancel alarms. This is done via the zmtrigger.pl script. This option indicates whether you want to use these external triggers. Most people will say no here.

scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in

@@ -2696,47 +2696,6 @@ our @options = (
     type        => $types{boolean},
     category    => "config",
   },
-  {
-    name        => "ZM_OPT_FRAME_SERVER",
-    default     => "no",
-    description => "Should analysis farm out the writing of images to disk",
-  #requires   => [ { name => "ZM_OPT_ADAPTIVE_SKIP", value => "yes" } ],
-    help        => qqq("
-        In some circumstances it is possible for a slow disk to take so
-        long writing images to disk that it causes the analysis daemon
-        to fall behind especially during high frame rate events.
-        Setting this option to yes enables a frame server daemon (zmf)
-        which will be sent the images from the analysis daemon and will
-        do the actual writing of images itself freeing up the analysis
-        daemon to get on with other things. Should this transmission
-        fail or other permanent or transient error occur, this function
-        will fall back to the analysis daemon.
-        "),
-    type        => $types{boolean},
-    category    => "system",
-  },
-  {
-    name        => "ZM_FRAME_SOCKET_SIZE",
-    default     => "0",
-    description => "Specify the frame server socket buffer size if non-standard",
-    requires    => [ { name => "ZM_OPT_FRAME_SERVER", value => "yes" } ],
-    help        => qqq("
-        For large captured images it is possible for the writes from
-        the analysis daemon to the frame server to fail as the amount
-        to be written exceeds the default buffer size. While the images
-        are then written by the analysis daemon so no data is lost, it
-        defeats the object of the frame server daemon in the first
-        place. You can use this option to indicate that a larger buffer
-        size should be used. Note that you may have to change the
-        existing maximum socket buffer size on your system via sysctl
-        (or in /proc/sys/net/core/wmem_max) to allow this new size to
-        be set. Alternatively you can change the default buffer size on
-        your system in the same way in which case that will be used
-        with no change necessary in this option
-        "),
-    type        => $types{integer},
-    category    => "system",
-  },
   {
     name        => "ZM_OPT_CONTROL",
     default     => "no",

scripts/zmdc.pl.in

@@ -89,7 +89,6 @@ delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 my @daemons = (
     'zmc',
     'zma',
-    'zmf',
     'zmfilter.pl',
     'zmaudit.pl',
     'zmtrigger.pl',

scripts/zmpkg.pl.in

@@ -251,10 +251,6 @@ if ( $command =~ /^(?:start|restart)$/ )
                 }
                 if ( $monitor->{Function} ne 'Monitor' )
                 {
-                    if ( $Config{ZM_OPT_FRAME_SERVER} )
-                    {
-                        runCommand( "zmdc.pl start zmf -m $monitor->{Id}" );
-                    }
                     runCommand( "zmdc.pl start zma -m $monitor->{Id}" );
                 }
                 if ( $Config{ZM_OPT_CONTROL} )

src/CMakeLists.txt

@@ -12,21 +12,19 @@ add_library(zm STATIC ${ZM_BIN_SRC_FILES})
 add_executable(zmc zmc.cpp)
 add_executable(zma zma.cpp)
 add_executable(zmu zmu.cpp)
-add_executable(zmf zmf.cpp)
 add_executable(zms zms.cpp)
 
 target_link_libraries(zmc zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
 target_link_libraries(zma zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
 target_link_libraries(zmu zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
-target_link_libraries(zmf zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
 target_link_libraries(zms zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
 
 # Generate man files for the binaries destined for the bin folder
-FOREACH(CBINARY zma zmc zmf zmu)
+FOREACH(CBINARY zma zmc zmu)
     POD2MAN(${CMAKE_CURRENT_SOURCE_DIR}/${CBINARY}.cpp zoneminder-${CBINARY} 8)
-ENDFOREACH(CBINARY zma zmc zmf zmu)
+ENDFOREACH(CBINARY zma zmc zmu)
 
-install(TARGETS zmc zma zmu zmf RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+install(TARGETS zmc zma zmu RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 install(TARGETS zms RUNTIME DESTINATION "${ZM_CGIDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 install(CODE "execute_process(COMMAND ln -sf zms nph-zms WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})" )
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/nph-zms DESTINATION "${ZM_CGIDIR}")

src/zm_event.cpp

@@ -42,8 +42,6 @@ extern "C"
 #include "zm_sendfile.h"
 }
 
-#include "zmf.h"
-
 #if HAVE_SYS_SENDFILE_H
 #include <sys/sendfile.h>
 #endif
@@ -221,135 +219,6 @@ void Event::createNotes( std::string &notes )
 
 int Event::sd = -1;
 
-bool Event::OpenFrameSocket( int monitor_id )
-{
-  if ( sd > 0 )
-  {
-    close( sd );
-  }
-
-  sd = socket( AF_UNIX, SOCK_STREAM, 0);
-  if ( sd < 0 )
-  {
-    Error( "Can't create socket: %s", strerror(errno) );
-    return( false );
-  }
-
-  int socket_buffer_size = config.frame_socket_size;
-  if ( socket_buffer_size > 0 )
-  {
-    if ( setsockopt( sd, SOL_SOCKET, SO_SNDBUF, &socket_buffer_size, sizeof(socket_buffer_size) ) < 0 )
-    {
-      Error( "Can't get socket buffer size to %d, error = %s", socket_buffer_size, strerror(errno) );
-      close( sd );
-      sd = -1;
-      return( false );
-    }
-  }
-
-  int flags;
-  if ( (flags = fcntl( sd, F_GETFL )) < 0 )
-  {
-    Error( "Can't get socket flags, error = %s", strerror(errno) );
-    close( sd );
-    sd = -1;
-    return( false );
-  }
-  flags |= O_NONBLOCK;
-  if ( fcntl( sd, F_SETFL, flags ) < 0 )
-  {
-    Error( "Can't set socket flags, error = %s", strerror(errno) );
-    close( sd );
-    sd = -1;
-    return( false );
-  }
-
-  char sock_path[PATH_MAX] = "";
-  snprintf( sock_path, sizeof(sock_path), "%s/zmf-%d.sock", config.path_socks, monitor_id );
-
-  struct sockaddr_un addr;
-
-  strncpy( addr.sun_path, sock_path, sizeof(addr.sun_path) );
-  addr.sun_family = AF_UNIX;
-
-  if ( connect( sd, (struct sockaddr *)&addr, strlen(addr.sun_path)+sizeof(addr.sun_family)+1) < 0 )
-  {
-    Warning( "Can't connect to frame server: %s", strerror(errno) );
-    close( sd );
-    sd = -1;
-    return( false );
-  }
-
-  Debug( 1, "Opened connection to frame server" );
-  return( true );
-}
-
-bool Event::ValidateFrameSocket( int monitor_id )
-{
-  if ( sd < 0 )
-  {
-    return( OpenFrameSocket( monitor_id ) );
-  }
-  return( true );
-}
-
-bool Event::SendFrameImage( const Image *image, bool alarm_frame )
-{
-  if ( !ValidateFrameSocket( monitor->Id() ) )
-  {
-    return( false );
-  }
-
-  static int jpg_buffer_size = 0;
-  static unsigned char jpg_buffer[ZM_MAX_IMAGE_SIZE];
-
-  image->EncodeJpeg( jpg_buffer, &jpg_buffer_size, (alarm_frame&&(config.jpeg_alarm_file_quality>config.jpeg_file_quality))?config.jpeg_alarm_file_quality:config.jpeg_file_quality );
-
-  static FrameHeader frame_header;
-
-  frame_header.event_id = id;
-  if ( config.use_deep_storage )
-    frame_header.event_time = start_time.tv_sec;
-  frame_header.frame_id = frames;
-  frame_header.alarm_frame = alarm_frame;
-  frame_header.image_length = jpg_buffer_size;
-
-  struct iovec iovecs[2];
-  iovecs[0].iov_base = &frame_header;
-  iovecs[0].iov_len = sizeof(frame_header);
-  iovecs[1].iov_base = jpg_buffer;
-  iovecs[1].iov_len = jpg_buffer_size;
-
-  ssize_t writev_size = sizeof(frame_header)+jpg_buffer_size;
-  ssize_t writev_result = writev( sd, iovecs, sizeof(iovecs)/sizeof(*iovecs));
-  if ( writev_result != writev_size )
-  {
-    if ( writev_result < 0 )
-    {
-      if ( errno == EAGAIN )
-      {
-        Warning( "Blocking write detected" );
-      }
-      else
-      {
-        Error( "Can't write frame: %s", strerror(errno) );
-        close( sd );
-        sd = -1;
-      }
-    }
-    else
-    {
-      Error( "Incomplete frame write: %zd of %zd bytes written", writev_result, writev_size );
-      close( sd );
-      sd = -1;
-    }
-    return( false );
-  }
-  Debug( 1, "Wrote frame image, %d bytes", jpg_buffer_size );
-
-  return( true );
-}
-
 bool Event::WriteFrameImage( Image *image, struct timeval timestamp, const char *event_file, bool alarm_frame )
 {
   Image* ImgToWrite;
@@ -364,11 +233,9 @@ bool Event::WriteFrameImage( Image *image, struct timeval timestamp, const char
   else
     ImgToWrite=image;
 
-  if ( !config.opt_frame_server || !SendFrameImage(ImgToWrite, alarm_frame) )
-  {
-    int thisquality = ( alarm_frame && (config.jpeg_alarm_file_quality > config.jpeg_file_quality) ) ? config.jpeg_alarm_file_quality : 0 ;   // quality to use, zero is default
-    ImgToWrite->WriteJpeg( event_file, thisquality, (monitor->Exif() ? timestamp : (timeval){0,0}) ); // exif is only timestamp at present this switches on or off for write
-  }
+  int thisquality = ( alarm_frame && (config.jpeg_alarm_file_quality > config.jpeg_file_quality) ) ? config.jpeg_alarm_file_quality : 0 ;   // quality to use, zero is default
+  ImgToWrite->WriteJpeg( event_file, thisquality, (monitor->Exif() ? timestamp : (timeval){0,0}) ); // exif is only timestamp at present this switches on or off for write
+
   if(ts_image) delete(ts_image); // clean up if used.
   return( true );
 }

src/zma.cpp

@@ -141,11 +141,6 @@ int main( int argc, char *argv[] )
   {
     Info( "In mode %d/%d, warming up", monitor->GetFunction(), monitor->Enabled() );
 
-    if ( config.opt_frame_server )
-    {
-      Event::OpenFrameSocket( monitor->Id() );
-    }
-
     zmSetDefaultHupHandler();
     zmSetDefaultTermHandler();
     zmSetDefaultDieHandler();

src/zmf.cpp

@@ -1,350 +0,0 @@
-//
-// ZoneMinder Image File Writer Implementation, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-// 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-// 
-
-/*
-
-=head1 NAME
-
-zmf - The ZoneMinder Frame daemon
-
-=head1 SYNOPSIS
-
- zmf -m <monitor_id>
- zmf --monitor <monitor_id>
- zmf -h
- zmf --help
- zmf -v
- zmf --version
-
-=head1 DESCRIPTION
-
-This is an optional daemon that can run in concert with the Analysis daemon and
-whose function it is to actually write captured frames to disk. This frees up
-the Analysis daemon to do more analysis (!) and so keep up with the Capture
-daemon better. If it isn't running or dies then the Analysis daemon just writes
-them itself. 
-
-=head1 OPTIONS
-
- -m, --monitor_id         - ID of the monitor to use
- -h, --help             - Display usage information
- -v, --version          - Print the installed version of ZoneMinder
-
-=cut
-
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <time.h>
-#include <sys/time.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <getopt.h>
-#include <signal.h>
-
-#include "zm.h"
-#include "zm_db.h"
-#include "zm_signal.h"
-#include "zm_monitor.h"
-
-#include "zmf.h"
-
-int OpenSocket( int monitor_id )
-{
-  int sd = socket( AF_UNIX, SOCK_STREAM, 0);
-  if ( sd < 0 )
-  {
-    Error( "Can't create socket: %s", strerror(errno) );
-    return( -1 );
-  }
-
-  char sock_path[PATH_MAX] = "";
-  snprintf( sock_path, sizeof(sock_path), "%s/zmf-%d.sock", config.path_socks, monitor_id );
-  if ( unlink( sock_path ) < 0 )
-  {
-    Warning( "Can't unlink '%s': %s", sock_path, strerror(errno) );
-  }
-
-  struct sockaddr_un addr;
-
-  strncpy( addr.sun_path, sock_path, sizeof(addr.sun_path) );
-  addr.sun_family = AF_UNIX;
-
-  if ( bind( sd, (struct sockaddr *)&addr, strlen(addr.sun_path)+sizeof(addr.sun_family)) < 0 )
-  {
-    Error( "Can't bind: %s", strerror(errno) );
-    exit( -1 );
-  }
-
-  if ( listen( sd, SOMAXCONN ) < 0 )
-  {
-    Error( "Can't listen: %s", strerror(errno) );
-    return( -1 );
-  }
-
-  struct sockaddr_un rem_addr;
-  socklen_t rem_addr_len = sizeof(rem_addr);
-  int new_sd = -1;
-  if ( (new_sd = accept( sd, (struct sockaddr *)&rem_addr, &rem_addr_len )) < 0 )
-  {
-    Error( "Can't accept: %s", strerror(errno) );
-    exit( -1 );
-  }
-  close( sd );
-
-  sd = new_sd;
-
-  Info( "Frame server socket open, awaiting images" );
-  return( sd );
-}
-
-int ReopenSocket( int &sd, int monitor_id )
-{
-  close( sd );
-  return( sd = OpenSocket( monitor_id ) );
-}
-
-void Usage()
-{
-  fprintf( stderr, "zmf -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" );
-  fprintf( stderr, "  -v, --version        : Report the installed version of ZoneMinder\n" );
-  exit( 0 );
-}
-
-int main( int argc, char *argv[] )
-{
-  self = argv[0];
-
-  srand( getpid() * time( 0 ) );
-
-  int id = -1;
-
-  static struct option long_options[] = {
-    {"monitor", 1, 0, 'm'},
-    {"help", 0, 0, 'h'},
-    {"version", 0, 0, 'v'},
-    {0, 0, 0, 0}
-  };
-
-  while (1)
-  {
-    int option_index = 0;
-
-    int c = getopt_long (argc, argv, "m:h:v", long_options, &option_index);
-    if (c == -1)
-    {
-      break;
-    }
-
-    switch (c)
-    {
-      case 'm':
-        id = atoi(optarg);
-        break;
-      case 'h':
-      case '?':
-        Usage();
-        break;
-      case 'v':
-        std::cout << ZM_VERSION << "\n";
-        exit(0);
-      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 log_id_string[16];
-  snprintf( log_id_string, sizeof(log_id_string), "m%d", id );
-
-  zmLoadConfig();
-
-  logInit( "zmf" );
-  
-  ssedetect();
-
-  Monitor *monitor = Monitor::Load( id, false, Monitor::QUERY );
-
-  if ( !monitor )
-  {
-    fprintf( stderr, "Can't find monitor with id of %d\n", id );
-    exit( -1 );
-  }
-
-  char capt_path[PATH_MAX];
-  char anal_path[PATH_MAX];
-  snprintf( capt_path, sizeof(capt_path), "%s/%d/%%s/%%0%dd-capture.jpg", config.dir_events, monitor->Id(), config.event_image_digits );
-  snprintf( anal_path, sizeof(anal_path), "%s/%d/%%s/%%0%dd-analyse.jpg", config.dir_events, monitor->Id(), config.event_image_digits );
-  zmSetDefaultTermHandler();
-  zmSetDefaultDieHandler();
-
-  sigset_t block_set;
-  sigemptyset( &block_set );
-
-  int sd = OpenSocket( monitor->Id() );
-
-  FrameHeader frame_header = { 0, 0, false, 0 };
-  //unsigned char *image_data = 0;
-
-  fd_set rfds;
-
-  struct timeval timeout;
-  timeout.tv_sec = 1;
-  timeout.tv_usec = 0;
-  while( 1 )
-  {
-    struct timeval temp_timeout = timeout;
-
-    FD_ZERO(&rfds);
-    FD_SET(sd, &rfds);
-    int n_found = select( sd+1, &rfds, NULL, NULL, &temp_timeout );
-    if( n_found == 0 )
-    {
-      Debug( 1, "Select timed out" );
-      continue;
-    }
-    else if ( n_found < 0)
-    {
-      Error( "Select error: %s", strerror(errno) );
-      ReopenSocket( sd, monitor->Id() );
-      continue;
-    }
-
-    sigprocmask( SIG_BLOCK, &block_set, 0 );
-
-    int n_bytes = read( sd, &frame_header, sizeof(frame_header) );
-    if ( n_bytes != sizeof(frame_header) )
-    {
-      if ( n_bytes < 0 )
-      {
-        Error( "Can't read frame header: %s", strerror(errno) );
-      }
-      else if ( n_bytes > 0 )
-      {
-        Error( "Incomplete read of frame header, %d bytes only", n_bytes );
-      }
-      else
-      {
-        Warning( "Socket closed at remote end" );
-      }
-      ReopenSocket( sd, monitor->Id() );
-      continue;
-    }
-    Debug( 1, "Read frame header, expecting %ld bytes of image", frame_header.image_length );
-    static unsigned char image_data[ZM_MAX_IMAGE_SIZE];
-
-        // Read for pipe and loop until bytes expected have been read or an error occurs
-        int bytes_read = 0;
-        do
-    {
-            n_bytes = read( sd, image_data+bytes_read, frame_header.image_length-bytes_read );
-            if (n_bytes < 0) break; // break on error
-            if (n_bytes < (int)frame_header.image_length)
-      {
-                // print some informational messages 
-                if (bytes_read == 0)
-                {
-                    Debug(4,"Image read : Short read %d bytes of %d expected bytes",n_bytes,frame_header.image_length);
-                }
-                else if (bytes_read+n_bytes == (int)frame_header.image_length)
-                {
-                    Debug(5,"Image read : Read rest of short read: %d bytes read total of %d bytes",n_bytes,frame_header.image_length);
-                }
-                else
-                {
-                    Debug(6,"Image read : continuing, read %d bytes (%d so far)", n_bytes, bytes_read+n_bytes);
-                }
-      }
-            bytes_read+= n_bytes;
-        } while (n_bytes>0 && (bytes_read < (ssize_t)frame_header.image_length) );
-
-        // Print errors if there was a problem
-        if ( n_bytes < 1 )
-        {
-            Error( "Only read %d bytes of %d\n", bytes_read, frame_header.image_length);
-            if ( n_bytes < 0 )
-      {
-                Error( "Can't read frame image data: %s", strerror(errno) );
-      }
-      else
-      {
-        Warning( "Socket closed at remote end" );
-      }
-      ReopenSocket( sd, monitor->Id() );
-      continue;
-    }
-
-    static char subpath[PATH_MAX] = "";
-        if ( config.use_deep_storage )
-        {
-          struct tm *time = localtime( &frame_header.event_time );
-          snprintf( subpath, sizeof(subpath), "%02d/%02d/%02d/%02d/%02d/%02d", time->tm_year-100, time->tm_mon+1, time->tm_mday, time->tm_hour, time->tm_min, time->tm_sec );
-        }
-        else
-        {
-          snprintf( subpath, sizeof(subpath), "%ld", frame_header.event_id );
-        }
-
-    static char path[PATH_MAX] = "";
-    snprintf( path, sizeof(path), frame_header.alarm_frame?anal_path:capt_path, subpath, frame_header.frame_id );
-    Debug( 1, "Got image, writing to %s", path );
-
-    FILE *fd = 0;
-    if ( (fd = fopen( path, "w" )) < 0 )
-    {
-      Error( "Can't fopen '%s': %s", path, strerror(errno) );
-      exit( -1 );
-    }
-    if ( 0 == fwrite( image_data, frame_header.image_length, 1, fd ) )
-    {
-      Error( "Can't fwrite image data: %s", strerror(errno) );
-      exit( -1 );
-    }
-    fclose( fd );
-
-    sigprocmask( SIG_UNBLOCK, &block_set, 0 );
-  }
-  logTerm();
-  zmDbClose();
-}

src/zmf.h

@@ -1,32 +0,0 @@
-//
-// ZoneMinder Image File Write Class Interface, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-// 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-// 
-
-#ifndef ZMFILE_H
-#define ZMFILE_H
-
-struct FrameHeader
-{
-  unsigned long event_id;
-  time_t event_time;
-  unsigned long frame_id;
-  bool alarm_frame;
-  unsigned long image_length;
-};
-
-#endif // ZMFILE_H

web/includes/functions.php

@@ -873,21 +873,12 @@ function zmaControl( $monitor, $mode=false ) {
         daemonControl( "stop", "zmtrack.pl", "-m ".$monitor['Id'] );
       }
       daemonControl( "stop", "zma", "-m ".$monitor['Id'] );
-      if ( ZM_OPT_FRAME_SERVER ) {
-        daemonControl( "stop", "zmf", "-m ".$monitor['Id'] );
-      }
     } else {
       if ( $mode == "restart" ) {
         if ( ZM_OPT_CONTROL ) {
           daemonControl( "stop", "zmtrack.pl", "-m ".$monitor['Id'] );
         }
         daemonControl( "stop", "zma", "-m ".$monitor['Id'] );
-        if ( ZM_OPT_FRAME_SERVER ) {
-          daemonControl( "stop", "zmf", "-m ".$monitor['Id'] );
-        }
-      }
-      if ( ZM_OPT_FRAME_SERVER ) {
-        daemonControl( "start", "zmf", "-m ".$monitor['Id'] );
       }
       daemonControl( "start", "zma", "-m ".$monitor['Id'] );
       if ( ZM_OPT_CONTROL && $monitor['Controllable'] && $monitor['TrackMotion'] && ( $monitor['Function'] == 'Modect' || $monitor['Function'] == 'Mocord' ) ) {

web/lang/ro_ro.php

@@ -822,14 +822,6 @@ $OLANG = array(
         'Prompt' => "Crează imagini analizate cu marcaje ale mişcării",
         'Help' => "Implicit, în cazul unei alarme, ZoneMinder înregistrează atât imaginile neprelucrate cât şi cele ce au fost analizate şi au zone marcate unde a fost detectată mişcare. Acest lucru poate fi foarte folositor la configurarea zonelor sau în analiza evenimentelor. Acest parametru permite oprirea înregistrării imaginilor cu zone de mişcare marcate."
     ),
-    'OPT_FRAME_SERVER' => array(
-        'Prompt' => "Daemon-ul de analiză va scrie imaginile pe disc",
-        'Help' => "În unele cazuri este posibil ca viteza de scriere a unui HDD sa fie atât de mică încat să cauzeze încetinirea daemon-ului de analiză în special în timpul evenimentelor cu multe cadre. Activarea acestei opţiuni porneşte daemon-ul de cadre (zmf) care va 'primi' imaginile de la daemon-ul de analiză şi le va scrie pe disc. Dacă această transmisie eşuează sau apar alte erori, funcţia de scriere va reveni daemon-ului de analiză."
-    ),
-    'FRAME_SOCKET_SIZE' => array(
-        'Prompt' => "Specificaţi dimensiunea memoriei tampon",
-        'Help' => "Pentru imaginile de dimensiuni mari capturate este posibil ca scrierea lor pe disc să eşueze deoarece cantitatea de informaţie scrisă este mai mare decât memoria tampon alocată. Deşi imaginile sunt scrise apoi de către daemon-ul de analiză, se distruge obiectul daemon-ului de cadre. Puteţi folosi această opţiune pentru a specifica o memorie tampon de dimensiuni mai mari. Va trebui sa modificaţi dimensiunea socket-ului tampon maxim folosind 'sysctl' (sau in /proc/sys/net/core/wmem_max) pentru a permite setarea acestei noi valori. Alternativa este să schimbaţi mărimea implicită a memorie tampon a sistemului, caz în care modificarea acestei valori nu mai este necesară."
-    ),
     'OPT_CONTROL' => array(
         'Prompt' => "Suport camere controlabile (rotire/înclinare/zoom)",
         'Help' => "ZoneMinder include suport limitat pentru camere controlabile. Sunt incluse câteva protocoale mostră şi pot fi adăugate cu uşurinţă şi altele. Dacă vreţi să controlaţi camerele prin intermediul ZoneMinder selectaţi această opţiune."