DistRen Changeset - 826e9ed804d5 · protofusion repositories

Changeset - 826e9ed804d5

Parent rev.

Child rev.

[Not reviewed]

Merge default

0 2 0

ethanzonca - 16 years ago 2009-09-27 19:35:05

Merge with d906e6d3c748e7c13a49079c2a55a56150bed978

2 files changed with 48 insertions and 1 deletions:

configure.ac

src/server/distrend.c

0 comments (0 inline, 0 general)

configure.ac

➞

Show inline comments

@@ @@ -25,38 +25,38 @@ AC_PROG_LIBTOOL @@
 AM_INIT_AUTOMAKE
 AM_PROG_CC_C_O
 AM_PATH_XML2(2.6.26)
 #basic low-level checks (suggested by autoscan)
 AC_CHECK_FUNCS([dup2])
 AC_CHECK_FUNCS([memset])
 AC_CHECK_FUNCS([strdup])
 AC_CHECK_HEADERS([fcntl.h])
 AC_CHECK_HEADERS([malloc.h])
 AC_FUNC_FORK
 AC_FUNC_MALLOC
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
 #package dependencies:
 PKG_PROG_PKG_CONFIG(0.17.2)
 PKG_CHECK_MODULES(DISTLIBS, libconfuse >= 2.5 libcurl libxml-2.0)
-PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
+PKG_CHECK_MODULES([CHECK], [check >= 0.9.3])
 AC_DEFINE_DIR([SYSCONFDIR], [sysconfdir], [Directory to find configuration files in])
 AC_CONFIG_FILES([Makefile
 src/Makefile
 src/common/Makefile
 src/server/Makefile
 src/client/Makefile
 src/tests/Makefile
 etc/Makefile
 ])
 AC_OUTPUT

src/server/distrend.c

➞

Show inline comments

@@ @@ -416,49 +416,96 @@ int distrend_do_config(int argc, char *a @@
   if(tmp)
     fprintf(stderr, "xml2distrenjob() returned %d. Try to cd to distren/doc if you want to test out the xml2distrenjob() function. (This will only fix this error if the error is due to an inability of the xml library to access distrenjob.xml.example)\n", tmp);
   else
     fprintf(stderr, "using email ``%s'' for user ``%s'' -- reading in XML files and pulling data from them using libxml2+XPath works!!!\n", distrenjob->email, distrenjob->submitter);
   fprintf(stderr, "%s:%d running config\n", __FILE__, __LINE__);
   *config = malloc(sizeof(struct distrend_config));
   myopts[1].simple_value = &(*config)->datadir;
   options_init(argc, argv, &(*config)->mycfg, myopts, "server", &(*config)->options);
   fprintf(stderr, "using %s as datadir\n", (*config)->datadir);
   xmlcleanup();
   return 0;
+}
 int distrend_config_free(struct distrend_config *config)
+{
   options_free(config->options);
   free(config);
   return 0;
+}
 /* ************************** Test Functions ************************* */
 void printFrameInfo(struct distrenjob *head, struct distrenjob *job, int frame_num)
+{
   char *status = "";
   frame_num = frame_num - job->frameset[0].num;
   switch(job->frameset[frame_num].status)
+  {
     case FRAMESETSTATUS_UNASSIGNED:
       _distren_asprintf(&status, "%s", "unassigned");
       break;
     case FRAMESETSTATUS_ASSIGNED:
       _distren_asprintf(&status, "%s", "assigned");
       break;
     case FRAMESETSTATUS_DONE:
       _distren_asprintf(&status, "%s", "completed");
       break;
     case FRAMESETSTATUS_CANCELED:
       _distren_asprintf(&status, "%s", "canceled");
+  }
   printf("frame #: %d --> %s", frame_num, status);
+}
 void printJob(struct distrenjob *head, struct distrenjob *job)
+{
   int counter;
   printf("frame_num: status");
   for(counter = 0; counter < job->total_frames; counter++)
+    {
       printFrameInfo(head, job, job->frameset[counter].num);
+    }
+}
 void printJobInfo(struct distrenjob *head, struct distrenjob *job)
+{
   printf("type: %d", job->type);
   printf("name: %s", job->email);
   printf("submitter: %s", job->submitter);
   printf("e-mail: %s", job->email);
   printf("priority, %d", job->priority);
   printf("completed: %d", job->completed_frames);
   printf("assigned: %d", job->assigned_frames);
   printf("total: %d", job->total_frames);
   printf("watchdog: %d", job->watchdog_forgiveness);
   printf("hibernate: %d", job->hibernate);
   printf("prev_frame: %d", job->prev_frame_index);
+}
 /* ************************** Main ************************* */
 int main(int argc, char *argv[])
+{
   /* @TODO: Put some arg-grabbing code here */
   struct distrenjob head;
   head.priority = 0; // make head have the highest priority
   int cont;
   struct distrend_listenset *listenset;
   struct distrend_config *config;
   enum clientstatus
+  {
     CLIENTSTATUS_UNINITIALIZED = 0,
     CLIENTSTATUS_BUSY = 1,
     CLIENTSTATUS_IDLE = 2
   } clientstatus;
   cont = 1;
   memset(&head, '\0', sizeof(struct distrenjob));

0 comments (0 inline, 0 general)