DistRen Changeset - 73285a55be12 · protofusion repositories

Changeset - 73285a55be12

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Nathan Brink (binki) - 16 years ago 2009-09-17 19:11:44
ohnobinki@ohnopublishing.net

distrenjob_remove() converted to dummied head

1 file changed with 13 insertions and 18 deletions:

src/server/distrend.c

0 comments (0 inline, 0 general)

src/server/distrend.c

➞

Show inline comments

@@ @@ -57,13 +57,13 @@ struct general_info { @@
 /*
   internally defined funcs's prototypes
 */
-void distrenjob_remove(struct distrenjob **head, struct distrenjob *bj);
 void distrenjob_remove(struct distrenjob *head, struct distrenjob *bj);
 struct distrenjob *distrenjob_get(struct distrenjob *head, jobnum_t jobnum);
 void distrenjob_enqueue(struct distrenjob *head, struct distrenjob *job);
 void mortition(struct distrenjob *head, struct distrenjob *job);
 /* Global Vars, try to cut down on these */
@@ @@ -177,13 +177,13 @@ void mortition(struct distrenjob *head, @@
           isJobDone = 0; // if a missing frame is found, set isJobDone to false
+        }
+    }
   if(isJobDone)
+    {
-      distrenjob_remove(&head, job);
       distrenjob_remove(head, job);
       general_info.jobs_in_queue--;
+    }
+}
 /**
    creates a structure from starting data, then calls another function to actually add that struct to the queue
@@ @@ -250,13 +250,13 @@ void distrenjob_enqueue(struct distrenjo @@
+}
 /**
    @arg head I may end up changing the head if job == head
  */
 void change_job_priority(struct distrenjob *head, struct distrenjob *job, int new_priority){
-  distrenjob_remove(&head, job);
   distrenjob_remove(head, job);
   job->priority = new_priority;
   struct distrenjob *current_job;
   struct distrenjob *prev_job = head;
   if(job->frameset[0].status == FRAMESETSTATUS_UNASSIGNED)
     /* if job was not yet started */
@@ @@ -372,32 +372,27 @@ struct distrenjob *distrenjob_get(struct @@
 /**
    Removes a distrenjob from the distrenjob linked list.
    @arg head a double pointer. the head pointer will have to be changed if distrenjob == *head. Thus, make sure that the pointer points to the pointer to the head that all functions use. (I'm going to come back to this and misunderstand myself ;-))
  */
-void distrenjob_remove(struct distrenjob **head, struct distrenjob *bj)
 void distrenjob_remove(struct distrenjob *head, struct distrenjob *bj)
+{
   struct distrenjob *previous_distrenjob;
   if(bj == *head)
     *head = bj->next;
   else
+    {
   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 */;
       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;
       /*
 	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)

0 comments (0 inline, 0 general)