DistRen Changeset - 122fb7609b63 · protofusion repositories

Changeset - 122fb7609b63

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

LordOfWar - 16 years ago 2009-10-14 16:07:51

fixed find_jobframe()
all the commands work, even deletejob

2 files changed with 24 insertions and 14 deletions:

src/server/distrend.c

src/server/distrenjob.c

0 comments (0 inline, 0 general)

src/server/distrend.c

➞

Show inline comments

@@ @@ -380,32 +380,42 @@ int find_jobframe(struct distrenjob *hea @@
   struct distrenjob *distrenjob_ptr;
   your_job_type = 0;
   found = 0;
   /* iterate through jobs from first to last */
   for(distrenjob_ptr = head->next; (!found && distrenjob_ptr) && !distrenjob_ptr->hibernate; distrenjob_ptr = distrenjob_ptr->next)
     for(frame_counter = (distrenjob_ptr->prev_frame_index + 1); !found && frame_counter < distrenjob_ptr->total_frames; frame_counter ++)
   for(distrenjob_ptr = head->next; distrenjob_ptr && !distrenjob_ptr->hibernate; distrenjob_ptr = distrenjob_ptr->next)
+  {
     for(frame_counter = (distrenjob_ptr->prev_frame_index + 1); frame_counter < distrenjob_ptr->total_frames; frame_counter ++)
+    {
       if(distrenjob_ptr->frameset[frame_counter].status == FRAMESETSTATUS_UNASSIGNED) // jobframe found
+	{
 	  found = 1;
 	  your_job_type = distrenjob_ptr->type;
 	  distrenjob_ptr->frameset[frame_counter].status = FRAMESETSTATUS_ASSIGNED;
 	  distrenjob_ptr->frameset[frame_counter].start_time = clock();
 	  distrenjob_ptr->assigned_frames++;
 	  distrenjob_ptr->prev_frame_index = frame_counter;
 	  updateJobStatsXML(distrenjob_ptr);
+	}
+      {
     	found = 1;
     	your_job_type = distrenjob_ptr->type;
     	distrenjob_ptr->frameset[frame_counter].status = FRAMESETSTATUS_ASSIGNED;
     	distrenjob_ptr->frameset[frame_counter].start_time = clock();
     	distrenjob_ptr->assigned_frames++;
     	distrenjob_ptr->prev_frame_index = frame_counter;
     	updateJobStatsXML(distrenjob_ptr);
+      }
       if(found)
     	break;
+    }
     if(found)
       break;
+  }
   if(!found)
+    {
       fprintf(stderr, "No more jobs to render\n");
       sleep(1); /*< @todo eliminate the need for this line*/
       return 1;
+    }
-  fprintf(stderr, "jobnum: %d", frame_counter);
   *job = distrenjob_ptr;
   *frame = &distrenjob_ptr->frameset[frame_counter];
   return 0;
+}
@@ @@ -1017,13 +1027,13 @@ int main(int argc, char *argv[]) @@
     case 2:
       fprintf(stderr, "Job number: ");
       scanf("%d", &jobnum);
       printJobInfo(distrenjob_get(&head, jobnum));
       break;
     case 3:
       if(find_jobframe(&head, &tmp_job, &tmp_frame))
+      if(!find_jobframe(&head, &tmp_job, &tmp_frame))
+      {
     	  fprintf(stderr, "frame was found, details below\n");
           fprintf(stderr, "Job#:%d\n", tmp_job->jobnum);
           fprintf(stderr, "Frame#:%d\n", tmp_frame->num);
+      }

src/server/distrenjob.c

➞

Show inline comments

@@ @@ -61,13 +61,13 @@ int distrenjob_new(struct distrenjob **d @@
   dj->width = 0;
   dj->height = 0;
   dj->completed_frames = 0;
   dj->assigned_frames = 0;
   dj->total_render_time = 0;
   dj->hibernate = 0;
-  dj->prev_frame_index = 5;
+  dj->prev_frame_index = -1;
   dj->watchdog_forgiveness = 3600; // initialize watchdog forgiveness at 1 hour
   dj->frameset = (struct frameset *)NULL; /*< @todo does frameset need to be initialized here? */
   return 0;
+}

0 comments (0 inline, 0 general)