DistRen Changeset - 3de305a5a38f · protofusion repositories

Changeset - 3de305a5a38f

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Ethan Zonca (ethanzonca) - 16 years ago 2010-02-13 21:59:45
e@ethanzonca.com

Mysql updates, fix me please

3 files changed with 16 insertions and 14 deletions:

src/server/distrend.c

src/server/mysql.c

src/server/mysql.h

0 comments (0 inline, 0 general)

src/server/distrend.c

➞

Show inline comments

@@ @@ -187,39 +187,39 @@ int main(int argc, char *argv[]) @@
       distrend_accept(general_info.config, clients);
       /* Make the following code more event-driven */
       frame_watchdog(&general_info.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(slaveKey, &job->jobnum, &frame->num); // Finds a frame to render @FIXME: Slavenum :D
+	  int returnnum = find_jobframe(slaveKey, &job->jobnum, &frame->num, conn); // Finds a frame to render @FIXME: Slavenum :D
 	  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(slaveKey, job->jobnum, frame->num); // @TODO: Make sure this actually works.
+      	  finish_frame(slaveKey, job->jobnum, frame->num, conn); // @TODO: Make sure this actually works.
+      	}
-    } /* while(!general_info.config->die) */
+    }
   distrend_unlisten(general_info.config->listens, clients);
   distrend_config_free(general_info.config);
   xmlcleanup();
   /** free() paths */
   free(general_info.files.geninfo);
   mysqlDisconnect(conn);
   return 0;
+}

src/server/mysql.c

➞

Show inline comments

@@ @@ -148,42 +148,47 @@ int mysqlResultFree(distrend_mysql_resul @@
   mysql_free_result(result->mysqlresult);
   free(result);
   return 0;
+}
 /**
    Querying Functions
  */
 /** Finish-Setter: Sets a frame to the "completed" status.*/
 // @QUERY: update `distren`.`Job` set `Finish_Confirmed`=1 where `Job_Key`='1' and `Frame` = somenumber;
 void finish_frame(int slaveKey, int jobKey, int frameNum)
+void finish_frame(int slaveKey, int jobKey, int frameNum, distrend_mysql_con_t conn)
+{
   MYSQL_RES *result;
   MYSQL_ROW row;
   char *query = "update `distren`.`Job` set `Finish_Confirmed`=1 where `Job_Key`='1' and `Frame` = somenumber;";
   result = mysqlQuery(conn, query);
   // Check to make sure the slavekey is the one who rendered the frame before finishing :D
   /*
   distrenjob->frameset[frame].status = FRAMESETSTATUS_DONE;
   distrenjob->total_render_time = distrenjob->total_render_time + (clock() - distrenjob->frameset[frame].start_time);
   distrenjob->completed_frames ++;
   distrenjob->assigned_frames --;
   geninfo->total_frames_rendered ++; //< Increase total frames var for stats
   update_general_info(geninfo);
   updateJobStatsXML(distrenjob);
   */
+}
 /** Changes the priority of an existing (and maybe running) job. @arg head I may end up changing the head if job == head */
 // @QUERY: update `distren`.`Job` set `Priority`='12', `Finish_Confirmed`=1 where `Job_Key`='1';
 int change_job_priority(int jobKey, int newPriority){
+int change_job_priority(int jobKey, int newPriority, distrend_mysql_con_t conn){
   /*
   struct distrenjob *current_job;
   struct distrenjob *prev_job;
   char *serialname;
   distrenjob_remove(geninfo, job);
   job->priority = new_priority;
   prev_job = &geninfo->head;
   if(job->frameset[0].status == FRAMESETSTATUS_UNASSIGNED)
@@ @@ -207,31 +212,28 @@ int change_job_priority(int jobKey, int @@
   update_xml_joblist(geninfo);
   // reserialize after changes
   job_getserialfilename(&serialname, geninfo, job->jobnum, 0);
   distrenjob_serialize(job, serialname);
   free(serialname);
 */
   return 0;
+}
 /**
   Frame Finder: matches your computer up with a lovely frame to render, starts looking at oldest job first
   @TODO: We must return both jobnum and framenum
   @TODO: Add calls in main()
   @return 0 success, other: error
   Frame Finder: Finds a frame for a slave to render
 */
 // @QUERY: Frame_Get()
 int find_jobframe(int slaveKey, int *jobKey, int *frameNum)
+int find_jobframe(int slaveKey, int *jobKey, int *frameNum, distrend_mysql_con_t conn)
+{
   /*
   if(geninfo->hibernate)
     return 1;
   unsigned int frame_counter;
   unsigned short int found;
   struct distrenjob *distrenjob_ptr;
   found = 0;
   // iterate through jobs from first to last

src/server/mysql.h

➞

Show inline comments

@@ @@ -49,20 +49,20 @@ int mysqlDisconnect(distrend_mysql_con_t @@
  */
 distrend_mysql_result_t mysqlQuery(struct distrend_mysql_con *conn, char *query);
 /**
    frees mysql query result.
    @return 0 on success
  */
 int mysqlResultFree(distrend_mysql_result_t result);
 /** Import */
 void finish_frame(int slaveKey, int jobKey, int frameNum);
 int change_job_priority(int jobKey, int newPriority);
 int find_jobframe(int slaveKey, int *jobKey, int *frameNum);
 void finish_frame(int slaveKey, int jobKey, int frameNum, distrend_mysql_con_t conn);
 int change_job_priority(int jobKey, int newPriority, distrend_mysql_con_t conn);
 int find_jobframe(int slaveKey, int *jobKey, int *frameNum, distrend_mysql_con_t conn);
 #endif /* MYSQL_H_ */

0 comments (0 inline, 0 general)