DistRen Changeset - a262fec921d2 · protofusion repositories

Changeset - a262fec921d2

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

LordOfWar - 16 years ago 2009-10-14 13:42:48

commented out start_data(), it was editing general_info

added fprintf where a function to create directories will be placed

1 file changed with 5 insertions and 1 deletions:

src/server/distrend.c

0 comments (0 inline, 0 general)

src/server/distrend.c

➞

Show inline comments

@@ @@ -243,24 +243,25 @@ int restoreJobState(struct distrenjob *j @@
         isJobDone = 0;
+    }
   return isJobDone;
+}
 /** creates a structure from starting data, then calls another function to actually add that struct to the queue */
 int prepare_distrenjob(struct distrenjob *head, int type, char *name, char *submitter, char *email, int priority, int start_frame, int end_frame, int width, int height)
+{
   int counter2;
   int counter;
   int tmp;
   char *path_with_num;
   struct distrenjob *distrenjob;
   tmp = distrenjob_new(&distrenjob);
   if(tmp)
     return 1;
   general_info.highest_jobnum++;
   distrenjob->jobnum = general_info.highest_jobnum;
   distrenjob->type = 1;
   distrenjob->name = name;
   distrenjob->submitter = submitter;
@@ @@ -276,24 +277,27 @@ int prepare_distrenjob(struct distrenjob @@
       return 1;
+    }
   /* prepares all the frames by setting that status to "unassigned" */
   counter2 = start_frame;
   for(counter = 0; counter < distrenjob->total_frames; counter++){
     distrenjob->frameset[counter].num = counter2;
     distrenjob->frameset[counter].status = FRAMESETSTATUS_UNASSIGNED;
     counter2++;
+  }
   _distren_asprintf(&path_with_num, "stor/job%d/out/", distrenjob->jobnum);
   fprintf(stderr, "creating dir '%s'", path_with_num);
   /* add job to queue */
   fprintf(stderr, "\nprepare_distrenjob: attempting makeJobDataXML()\n");
   makeJobDataXML(distrenjob);
   fprintf(stderr, "\nprepare_distrenjob: attempting distrenjob_enqueue()\n");
   distrenjob_enqueue(head, distrenjob);
   general_info.jobs_in_queue++;
   fprintf(stderr, "\nprepare_distrenjob: attempting updateJobListXML()\n");
   updateJobListXML(head);
   fprintf(stderr, "\nprepare_distrenjob: attempting updateGeneralInfo()\n");
   updateGeneralInfo();
   fprintf(stderr, "\nprepare_distrenjob: attempting updateJobStatsXML()\n");
@@ @@ -961,25 +965,25 @@ int main(int argc, char *argv[]) @@
 	  return 2;
+	}
       else if(strcmp(argv[counter], "-t") == 0)
+	{
 	  fprintf(stderr, "Entering into test mode...\n\n");
 	  test=1;
+	}
+    }
   cont = 1;
   memset(&head, '\0', sizeof(struct distrenjob));
   start_data(&head); // Starts fresh or loads data from xml dump. Should we grab the return?
+  //start_data(&head); // Starts fresh or loads data from xml dump. Should we grab the return?
   distrend_do_config(argc, argv, &config);
   while(test == 1)
+  {
     fprintf(stderr, "Welcome to DistRen Alpha Interactive Test Mode\n\n");
     fprintf(stderr, "\t1 \tPrint all frames in a job\n");
     fprintf(stderr, "\t2 \tExamine certain job\n");
     fprintf(stderr, "\t3 \tGet a frame to render\n");
     fprintf(stderr, "\t4 \tAdd a job\n");

0 comments (0 inline, 0 general)