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

@@ @@ -151,111 +151,111 @@ int main(int argc, char *argv[]) @@
     return 1;
   /** preset paths */
   _distren_asprintf(&general_info.files.geninfo, "%s/general_info.xml",
 		    general_info.config->datadir);
   /* @QUERY: Obselete?
   if(start_data(&general_info))
+    {
       fprintf(stderr, "%s:%d: start_data() failed\n", __FILE__, __LINE__);
       return 1;
+    }
     */
   /** MySQL Connection */
   struct distrend_mysql_con *conn;
   if(mysqlConnect(&conn))
+    {
       fprintf(stderr, "%s:%d: mysqlConnect() failed\n", __FILE__, __LINE__);
       return 1;
+    }
   /** pre-loaded jobs for testing */
   // prepare_distrenjob(&general_info, 1, "awesome", "LordOfWar", 8, 1, 100, 640, 480);
   // prepare_distrenjob(&general_info, 1, "hamburger", "ohnobinki", 3, 1, 50, 1280, 720);
   /** Execute test function */
   // interactiveTest(test, general_info);
   distrend_listen(general_info.config, &clients);
   int slaveKey = 0; // Remotio should set me on a per-slave basis
   /* Main Loop */
   while(!general_info.config->die)
+    {
       int clientsays = 0; /*< temporary example variable, will be replaced when we can handle messages */
       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;
+}
 /* ********************** Functions ************************* */
 /** Dumps all data in RAM to an xml file (such as current jobs, etc) which is parsed by start_data. Remember to invoke this before shutting down! @TODO: Fill this stub*/
 // @QUERY: Obselete function, get rid of me!
 /*
 int xml_dump()
+{
   return 0;
+}
 */
 /**
    Performs command stored in a client's request. @TODO: Fill stub
 */
 int distrend_do()
+{
   return 0;
+}
 /**
     Fill variables at startup from XML dumps or defaults
  */
 // @QUERY: Obselete function, as data is stored in sql now.
 /*
 int start_data(struct general_info *general_info)
+{
   struct stat buffer;
 // defaults
   memset(&general_info->head, '\0', sizeof(struct distrenjob));
   general_info->head.priority = 0;

src/server/mysql.c

➞

Show inline comments

@@ @@ -112,160 +112,162 @@ distrend_mysql_result_t mysqlQuery(distr @@
   distrend_mysql_result_t distrenresult;
   /**
      pointless sanity check
   */
   if(conn->pointlesscheck != SEVENTY_FIVE)
     fprintf(stderr, "warning, I was passed a bad struct distrend_mysql_con...\n");
   /** make sure that connection is still alive
    */
   if(mysql_ping(conn->mysqlconn))
     fprintf(stderr, "MySQL Connection _was_ broken or may be broken, I'm not sure exactly what this return value means\n");
   if (mysql_query(conn->mysqlconn, query))
      fprintf(stderr, "%s\n", mysql_error(conn->mysqlconn));
   result = mysql_use_result(conn->mysqlconn);
   distrenresult = malloc(sizeof(struct distrend_mysql_result));
   if(!distrenresult)
+    {
       mysql_free_result(result);
       return NULL;
+    }
   distrenresult->mysqlresult = result;
   distrenresult->pointlesscheck = FORTY_TWO;
   return distrenresult;
+}
 int mysqlResultFree(distrend_mysql_result_t result)
+{
   if(result->pointlesscheck != FORTY_TWO)
     fprintf(stderr, "%s:%d: I didn't get the type of handle I wanted\n", __FILE__, __LINE__);
   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)
       //  if job was not yet started
+    {
       distrenjob_enqueue(geninfo, job);
       return 0;
+    }
     // iterate through linked list of jobs
     for(current_job = &geninfo->head;
         current_job != NULL
           && job->priority > current_job->priority;
         current_job = current_job->next)
       prev_job = current_job;
     prev_job->next = job;
     job->next = current_job;
   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
   for(distrenjob_ptr = geninfo->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;
         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;
+    }
   *job = distrenjob_ptr;
   *frame = &distrenjob_ptr->frameset[frame_counter];
 */
   return 0;
+}

src/server/mysql.h

➞

Show inline comments

@@ @@ -13,56 +13,56 @@ @@
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Affero General Public License for more details.
   You should have received a copy of the GNU Affero General Public License
   along with DistRen.  If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef MYSQL_H_
 #define MYSQL_H_
 struct distrend_mysql_con;
 struct distrend_mysql_result;
 typedef struct distrend_mysql_con *distrend_mysql_con_t;
 typedef struct distrend_mysql_result *distrend_mysql_result_t;
 /**
    initiates a MySQL connection
    @param conn, pointer will be set to the struct
    @return 0 on success
  */
 int mysqlConnect(distrend_mysql_con_t *conn);
 /**
    cleans and disconnects MySQL connection
    @param conn connection to clean
    @return 0 on success
 */
 int mysqlDisconnect(distrend_mysql_con_t conn);
 /**
    performs mysql query.
    errors will be logged to the user by this function.
    @return pointer to query handle on success, NULL on failure
  */
 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)