DistRen Changeset - 7a41ccaab4c9 · protofusion repositories

Changeset - 7a41ccaab4c9

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

LordOfWar - 16 years ago 2009-10-01 01:21:36

changed up printJob and printFrame to require less parameters, and now printJob only passes a pointer to a frame to printFrame

create a loop in the main function to interact with the queue in order to test it... it still needs a bit of work though

1 file changed with 39 insertions and 6 deletions:

src/server/distrend.c

0 comments (0 inline, 0 general)

src/server/distrend.c

➞

Show inline comments

@@ @@ -345,237 +345,270 @@ void frame_watchdog(struct distrenjob *d @@
    @arg jobnum job number to search for
    @return NULL on job doesn't exist
  */
 struct distrenjob *distrenjob_get(struct distrenjob *head, jobnum_t jobnum)
+{
   struct distrenjob *distrenjob_ptr;
   /*
     The conditions of the for loop will leave distrenjob_ptr at NULL if the end of the list is reached. It will leave it pointing to the correct job if it is found.
    */
   for(distrenjob_ptr = head;
       distrenjob_ptr
         && distrenjob_ptr->jobnum != jobnum;
       distrenjob_ptr = distrenjob_ptr->next);
   return distrenjob_ptr;
+}
 /**
    Removes a distrenjob from the distrenjob linked list. It does not free the distrenjob, however. You should do that with distrenjob_free() from distrenjob.h
    @arg head pointer to the head of the linkedlist of distrenjobs
  */
 void distrenjob_remove(struct distrenjob *head, struct distrenjob *bj)
+{
   struct distrenjob *previous_distrenjob;
   for(previous_distrenjob = head;
       previous_distrenjob
 	&& previous_distrenjob->next != bj; /*< stop on the distrenjob that comes before bj */
       previous_distrenjob = previous_distrenjob->next)
     /* all of the action is in the definition of the for loop itself */;
   /*
     This removes references to bj from the linked list. I.E., we now skip bj when iterating through the list
   */
   previous_distrenjob->next = bj->next;
   general_info.jobs_in_queue--;
+}
 /* Grabs config info from confs */
 int distrend_do_config(int argc, char *argv[], struct distrend_config **config)
+{
   cfg_opt_t myopts_listen[] =
+    {
       CFG_SIMPLE_STR("type", NULL),
       CFG_SIMPLE_STR("path", NULL),
       CFG_SIMPLE_INT("port", NULL),
       CFG_END()
     };
   cfg_opt_t myopts[] =
+    {
       CFG_SEC("listen",  /* this must be imported into struct listens (which must still be declared) */
           myopts_listen,
           CFGF_MULTI),
       CFG_SIMPLE_STR("datadir", NULL),
       CFG_END()
     };
   struct distrenjob *distrenjob;
   int tmp;
   xmlinit();
   /*
    * test xml2distrenjob()
    */
   tmp = xml2distrenjob(&distrenjob, "distrenjob.xml.example");
   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\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)
+void printFrameInfo(struct frameset *frame)
+{
   char *status = "";
   frame_num = frame_num - job->frameset[0].num;
-  switch(job->frameset[frame_num].status)
+  switch(frame->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);
+  printf("frame #: %d --> %s", frame->num, status);
+}
-void printJob(struct distrenjob *head, struct distrenjob *job)
 void printJob(struct distrenjob *job)
+{
   int counter;
   printf("frame_num: status");
   for(counter = 0; counter < job->total_frames; counter++)
+    {
-      printFrameInfo(head, job, job->frameset[counter].num);
+      printFrameInfo(&job->frameset[counter]);
+    }
+}
 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[])
+{
   /* Argument-parser */
   int counter = 0;
   int test = 0; // Have some fun if-ness that does fun stuff when this is 1
   int die = 0;
   for(counter=0; counter<argc; counter++){
          if(strcmp(argv[counter], "-h") == 0) {
            fprintf(stderr, "Usage: distrend [option] \nStarts the distrend server\n\t-h\tshow this help\n\t-t\tlaunches queue testing interface \n");
            return 2;
+          }
           else if(strcmp(argv[counter], "-t") == 0) {
             fprintf(stderr, "Entering into test mode...\n\n");
             test=1;
+          }
           else{
             fprintf(stderr, "Please enter some compatible args (see -h), or invoke with no args.\n\n");
             die=1;
+          }
+  }
   if(die==1){
     return 3;
+  }
   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));
   start_data(); // Starts fresh or loads data from xml dump. Should we grab the return?
   distrend_do_config(argc, argv, &config);
   while(t==1)
+  {
 	  int command;
 	  printf("1-->print all frames in a job");
 	  printf("2-->examine certain job");
 	  printf("3-->get a frame to render");
 	  printf("4-->add a job");
 	  printf("5-->delete a job");
 	  printf("6-->exit menu");
 	  command = scanf();
 	  if(command == 6)
 		  break;
 	  switch(command)
+	  {
 	  case 1:
 		  printf("job number:");
 		  command = scanf();
 		  printJob(distrenjob_get(head, command));
 		  break;
 	  case 2:
 		  break;
 	  case 3:
 		  break;
 	  case 4:
 		  break;
 	  case 5:
 		  break;
+	  }
+  }
   distrend_listen(&listenset, config);
   /* This is called the "main loop" */
   while(cont)
+    {
       struct distren_action *action;
       int clientsays = 0; /*< temporary example variable, will be replaced when we can handle messages */
       distrend_accept(&action);
       cont = distrend_do(action);
       /* Make the following code more event-driven */
       frame_watchdog(&head);
       struct frameset *frame;
       struct distrenjob *job;
       /* If the client is idle, must be modified for climbing through linked list of clients (client->clientnum) */
       if(clientstatus == CLIENTSTATUS_IDLE)
+	{
 	  int returnnum = find_jobframe(&head, &job, &frame); // Finds a frame to render
 	  if(returnnum)
+	    {
 	      fprintf(stderr,"No frames are available to render at this time. Idling...\n");
 	      sleep(10);
+	    }
 	  else
 	    remotio_send_to_client(frame->num, job->jobnum); // Pseudo-sends data to client
+	}
       /* If the client states that they finished the frame */
       	if(clientsays == DISTREN_REQUEST_DONEFRAME){
       	  clientstatus = CLIENTSTATUS_IDLE; // Sets the client back to idle
       	  finish_frame(&head, job, frame->num); // @TODO: Make sure this actually works.
+      	}
       distrend_action_free(action);
+    }
   distrend_unlisten(listenset);
   distrend_config_free(config);
   return 0;
+}

0 comments (0 inline, 0 general)