DistRen Changeset - f0273ec64281 · protofusion repositories

Changeset - f0273ec64281

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Nathan Brink (binki) - 16 years ago 2010-01-31 00:21:28
ohnobinki@ohnopublishing.net

remove NUMBER_ELEVEN, fix RUNSTATEDIR

3 files changed with 3 insertions and 7 deletions:

configure.ac

src/Makefile.am

src/server/distrend.c

0 comments (0 inline, 0 general)

configure.ac

➞

Show inline comments

@@ @@ -56,22 +56,22 @@ AC_DEFINE([_GNU_SOURCE], [1]) @@
 #package dependencies:
 PKG_PROG_PKG_CONFIG(0.17.2)
 PKGCONFIG_OHNOWRAP([DISTLIBS], [libconfuse >= 2.5 libcurl libxml-2.0 liblist >= 2.2.1])
 PKGCONFIG_OHNOWRAP([CHECK], [check >= 0.9.3])
 # define paths for configuration files:
 AC_DEFINE_DIR([LOCALSTATEDIR], [localstatedir], [Default directory for storing state information])
-AC_DEFINE_DIR([RUNSTATEDIR], [runstatedir], [Default directory for registering runtime information like pid-files])
+AC_DEFINE_DIR([RUNSTATEDIR], [localstatedir/run], [Default directory for registering runtime information like pid-files])
 AC_CONFIG_FILES([Makefile
 src/Makefile
 src/tests/Makefile
 etc/distrendaemon.conf
 etc/distrenslave.conf
 ])
 AC_OUTPUT

src/Makefile.am

➞

Show inline comments

 SUBDIRS = . tests
 AM_CPPFLAGS = -DSYSCONFDIR='"$(sysconfdir)"' \
 	-DLOCALSTATEDIR='"$(localstatedir)"' \
 	-DRUNSTATEDIR='"$(localstatedir)/run"' \
 	-I. -I$(top_srcdir)/src/common
 AM_CFLAGS = $(DISTLIBS_CFLAGS)
 AM_LDFLAGS = $(DISTLIBS_LDFLAGS)
 # LIBS, LDFLAGS, Huh!?
 LIBS = $(DISTLIBS_LDADD)
 LDADD = libdistrencommon.la
 include_HEADERS = client/distren.h
 bin_PROGRAMS = distren
 if ENABLE_SERVER
 bin_PROGRAMS += distrend distrenslave

src/server/distrend.c

➞

Show inline comments

@@ @@ -36,27 +36,24 @@ @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <time.h>
 #include <unistd.h>
 #include <libxml/encoding.h>
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 #include <libxml/xmlmemory.h>
 #include <libxml/xmlreader.h>
 #include <libxml/xmlwriter.h>
 /* local defs */
 #define NUMBER_ELEVEN 11
 /* ******************* Structs ************************ */
 struct general_info
+{
   struct distrenjob head;
   struct distrend_config *config;
   struct
+  {
     /** general_info.xml */
     char *geninfo;
@@ @@ -514,25 +511,25 @@ int find_jobframe_new(struct general_inf @@
   greatest_power_difference = -10000;
   found = 0;
   /* iterate through jobs from first to last */
   for(distrenjob_ptr = geninfo->head.next;
       distrenjob_ptr && !distrenjob_ptr->hibernate;
       distrenjob_ptr = distrenjob_ptr->next)
+  {
 	  if(distrenjob_ptr->prev_frame_index < (distrenjob_ptr->total_frames - 1))
+	  {
 	    /**
 	       Why is the number 11 found here again? --ohnobinki
 	     */
-		  power_difference = (((float)geninfo->total_render_power / (float)geninfo->total_priority_pieces) * (NUMBER_ELEVEN - (float)distrenjob_ptr->priority));
 		  power_difference = (((float)geninfo->total_render_power / (float)geninfo->total_priority_pieces) * ((float)distrenjob_ptr->priority));
 		  power_difference = power_difference - (float)distrenjob_ptr->assigned_render_power;
 		  fprintf(stderr, "job num %d\npower difference: %f\n", distrenjob_ptr->jobnum, power_difference);
 		  if(power_difference > greatest_power_difference)
+		  {
 			  job_to_render = distrenjob_ptr;
 			  greatest_power_difference = power_difference;
 			  found = 1;
+		  }
+	  }
+  }
@@ @@ -887,25 +884,25 @@ int update_xml_joblist(struct general_in @@
   counter = 0;
   for(job = geninfo->head.next; job; job = job->next)
+    {
       _distren_asprintf(&tmp, "%d", job->jobnum);
       xmlTextWriterWriteElement(writer, (xmlChar*)"jobnum", (xmlChar*)tmp);
       free(tmp);
       /**
 	this is needed for the new frame finder to work
 	Why the random constant numeral 11? --ohnobinki
       */
-      geninfo->total_priority_pieces = geninfo->total_priority_pieces + (NUMBER_ELEVEN - job->priority);
       geninfo->total_priority_pieces = geninfo->total_priority_pieces + job->priority;
       counter++;
+    }
   xmlTextWriterEndElement(writer);
   /**
      close elements and end document
   */
   xmlTextWriterEndDocument(writer);
   /**

0 comments (0 inline, 0 general)