WebSVN – heizung – Diff – /trunk/heizung.c

 int readHeizPlanName(char *fname);
 int writeHeizPlan(void);
 int writeHeizPlanName(char *fname);
 void readConf(void);
+HEIZINDEX *allocMem(HEIZINDEX *first);
+int sortTable(void);
 char *readLine(int fd, char *buf, int bufLen);
 char *trim(char *str);
 char *remove_string(char *str, char *search, char *ret);
-static pthread_mutex_t fastmutex = PTHREAD_MUTEX_INITIALIZER;
+//static pthread_mutex_t fastmutex = PTHREAD_MUTEX_INITIALIZER;
 static pthread_mutex_t fastmutex_ser = PTHREAD_MUTEX_INITIALIZER;
 static pthread_mutex_t fastmutex_proc = PTHREAD_MUTEX_INITIALIZER;
 /*
  * The main program, initializing everything and start the daemon.
  * Detach application from console and make it a daemon.
  */
 void daemon_start (int ignsigcld)
+{
 int childpid, fd;
+char hv0[64];
         if (getpid () == 1)
            goto out;
 #ifdef SIGTTOU
 //           signal (SIGCLD, sig_child);
 //#else
            signal (SIGCLD, SIG_IGN);
 //#endif
+        }
+	// Create PID file
+	if ((fd = open(configs.Pidfile, O_RDWR | O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)) == -1)
+	{
+	   syslog(LOG_WARNING,"Can't create PID file %s: %s",configs.Pidfile, strerror(errno));
+	   return;
+	}
+	sprintf(&hv0[0],"%d", getpid());
+	write(fd, hv0, strlen(hv0));
+	close(fd);
+}
 void sig_child ()
+{
 #if defined(BSD) && !defined(sinix) && !defined(Linux)
 	length = sizeof(client1);
         syslog (LOG_DEBUG, "Server ready: %d",s);
 	while (1)
+	{
-	   pthread_mutex_lock (&fastmutex);
+//	   pthread_mutex_lock (&fastmutex);
 	   // Read time table at every loop, to be sure to have the latest
 	   // version (User may change it at every time)
 	   if (!readHeizPlan())
+	   {
 	      if (!HeizFirst)
+	      }
 	      else
 		 syslog(LOG_DAEMON, "Error reading table with plan! Will work with old one.");
+	   }
-	   pthread_mutex_unlock(&fastmutex);
+//	   pthread_mutex_unlock(&fastmutex);
 	   if ((s1 = accept (s, (struct sockaddr *)&client1, &length)) < 0)
+	   {
 	      syslog (LOG_DAEMON, "Error in accept: %d: %s", s1, strerror(errno));
 	      continue;
 	strcpy(configs.User,"nobody");
 	strcpy(configs.Grp,"nobody");
 	strcpy(configs.HeizPath, "/var/www/.HeizPlan.conf");
 	strcpy(configs.Werte, "/var/log/werte.dat");
 	strcpy(configs.Device, "/dev/ttyS1");
+	strcpy(configs.Pidfile, "/var/run/heizung.pid");
 	configs.port = 11001;
 	if (!confFile[0] || (fd = open(confFile,O_RDONLY)) == -1)
+	{
 	   if (confFile[0])
+	   {
 	      syslog(LOG_INFO,"Found \"Device\": %s", hv1);
 	      strncpy (configs.Device, hv1, sizeof(configs.Device));
+	   }
+	   if (!strcasecmp(hv0, "Pidfile"))
+	   {
+	      syslog(LOG_INFO,"Found \"Pidfile\": %s", hv1);
+	      strncpy (configs.Pidfile, hv1, sizeof(configs.Pidfile));
+	   }
 	   if (!strcasecmp(hv0, "VID"))
+	   {
 	      syslog(LOG_INFO,"Found VendorID: %04x", atoi(hv1));
 	      configs.VID = atoi(hv1);
+	   }
 	return writeHeizPlanName(configs.HeizPath);
+}
 int writeHeizPlanName(char *fname)
+{
-int fd;
+int fd, wday;
+ulong lastEnd;
-char hv0[512], path[512];
+char hv0[128], path[512];
 HEIZINDEX *act;
 	fd = -1;
 	if (makeFileName(&path[0], fname, sizeof(path)) == NULL)
+	{
 	   syslog(LOG_DAEMON,"No or invalid path %s", fname);
 	   return 0;
+	}
+	if (!sortTable())
+	   return 0;
 	if ((fd = open(path, O_RDWR | O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)) == -1)
+	{
 	   syslog(LOG_DAEMON, "Error opening/creating file %s: %s", path, strerror(errno));
 	   return 0;
+	}
-	act = HeizFirst;
+	// Sort table for week days
-	while(act)
+	for (wday = 1; wday <= 7; wday++)
+	{
+	   lastEnd = 0L;
-	   if (act->heizung->wday)
+	   act = HeizFirst;
+	   while(act)
+	   {
+	      if (act->heizung->wday == wday)
+	      {
 	      int hour, min;
-	      hour = act->heizung->end / 3600;
+		 hour = act->heizung->end / 3600;
-	      min = (act->heizung->end - (hour * 3600)) / 60;
+		 min = (act->heizung->end - (hour * 3600)) / 60;
+		 if (hour > 23)
+		 {
+		    hour = 23;
+		    min = 59;
+		 }
+		 sprintf(&hv0[0], "%d,%02d:%02d,%.1f\n",
+		     act->heizung->wday, hour, min,
+		     act->heizung->temp);
+		 write(fd, &hv0[0], strlen(hv0));
+	      }
+	      act = act->next;
+	   }
+	}
+	close(fd);
+	return 1;
+}
+/*
+ * Allocate the memory for the actual heizung plan.
+ * This function appends an element to the end of the chain.
+ */
+HEIZINDEX *allocMem(HEIZINDEX *first)
+{
+HEIZINDEX *act, *last;
+	if (!first)
+	{
+	   first = malloc(sizeof(HEIZINDEX));
+	   if (first)
+	   {
+	      first->heizung = malloc(sizeof(HEIZUNG));
+	      first->next = NULL;
+	   }
+	   else
+	      return NULL;
+	   return first;
+	}
+	else
+	{
+	   // Find last element
+	   last = first;
+	   while(last->next)
+	      last = last->next;
+	   act = malloc(sizeof(HEIZINDEX));
+	   if (act)
+	   {
+	      act->heizung = malloc(sizeof(HEIZUNG));
+	      act->next = NULL;
+	      last->next = act;
+	   }
+	   else
+	      return NULL;
+	   return act;
+	}
+	return NULL;
+}
+// This function sorts the table for week days and every into increasing
+// time stamps
+int sortTable()
+{
+int count, actElement, wday, flag;
+ulong end;
+HEIZINDEX *first, *act, *p;
+	if (!HeizFirst)
+	   return 0;
+	p = HeizFirst;
+	// Count the number of elements
+	count = 0;
+	while (p)
+	{
+	   if (p->heizung->wday)
+	      count++;
+	   p = p->next;
+	}
+	wday = 1;
+	act = first = NULL;
+	actElement = 0;
+	// First loop sorts for week days
+	while (actElement < count && wday <= 7)
+	{
+	int cnt, pos;
+	   p = HeizFirst;
+	   flag = 0;
+	   // find number of entries for actual week day
+	   cnt = 0;
+	   act = HeizFirst;
+	   while(act)
+	   {
+	      if (act->heizung->wday == wday)
+		 cnt++;
-	      if (hour > 23)
+	      act = act->next;
+	   }
+	   pos = 0;
+	   end = 0L;
+	   // Second loop sorts the actual week day for end times
+	   while (p)
+	   {
+	      if (p->heizung->wday == wday && p->heizung->start == end && p->heizung->end > end)
+	      {
+		 actElement++;
-		 hour = 23;
+		 flag = 1;
+		 act = allocMem(first);
+		 if (!first)
+		    first = act;
+		 // Check for valid memory block
-		 min = 59;
+		 if (act)
+		 {
+		    memmove(act->heizung, p->heizung, sizeof(HEIZUNG));
+		    end = p->heizung->end;
+		    pos++;
+		 }
+		 else
+		 {
+		    syslog(LOG_DAEMON,"Error allocationg memory for sorting table: %s", strerror(errno));
+		    // Free allocated memory
+		    act = first;
+		    while(act)
+		    {
+		       p = act->next;
+		       free(act->heizung);
+		       free(act);
+		       act = p;
+		    }
+		    return 0;
+		 }
+	      }
+	      p = p->next;
-	      sprintf(&hv0[0], "%d,%02d:%02d,%.1f\n",
+	      // If there are still members left, reset pointer and restart loop
-		   act->heizung->wday, hour, min,
+	      if (!p && pos < (cnt - 1) && flag)
+	      {
-		   act->heizung->temp);
+		 p = HeizFirst;
-	      write(fd, &hv0[0], strlen(hv0));
+		 flag = 0;
+	      }
+	   }
-	   act = act->next;
+	   wday++;
+	}
-	close(fd);
+	freeMemory();
+	HeizFirst = first;
 	return 1;
+}
 char *readLine(int fd, char *buf, int bufLen)
+{

Subversion Repositories heizung

(root)/trunk/heizung.c – Rev 9 → 10