DistRen Changeset - f5a1573ebc08 · protofusion repositories

Changeset - f5a1573ebc08

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Nathan Brink (binki) - 16 years ago 2010-02-13 23:01:22
ohnobinki@ohnopublishing.net

fix up finish_frame() into mysql.c, reorganize mysql.? a bit

3 files changed with 75 insertions and 26 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

@@ @@ -48,12 +48,13 @@ @@
 #include <libxml/xmlwriter.h>
 /* ******************* Structs ************************ */
 struct general_info
+{
   struct distrenjob head;
   distrend_mysql_conn_t conn;
   struct distrend_config *config;
   struct
+  {
     /** general_info.xml */
@@ @@ -78,13 +79,13 @@ struct general_info @@
    Function Prototypes
    ********************************************* */
 /* ************General Functions************* */
 // int xml_dump();
 int distrend_do();
-// int start_data(struct general_info *general_info);
 int start_data(struct general_info *general_info);
 int mortition(struct general_info *geninfo, struct distrenjob *job);
 // int restoreJobState(struct distrenjob *job);
 // int prepare_distrenjob(struct general_info *geninfo, int type, char *name, char *submitter, int priority, int start_frame, int end_frame, int width, int height);
 // int distrenjob_enqueue(struct general_info *geninfo, struct distrenjob *job);
 // int find_jobframe_from_job(struct distrenjob *distrenjob_ptr, struct distrenjob **job, struct frameset **frame);
 // int find_jobframe_new(struct general_info *geninfo, int rend_pwr, struct distrenjob **job, struct frameset **frame);
@@ @@ -160,14 +161,13 @@ int main(int argc, char *argv[]) @@
       fprintf(stderr, "%s:%d: start_data() failed\n", __FILE__, __LINE__);
       return 1;
+    }
     */
   /** MySQL Connection */
   struct distrend_mysql_con *conn;
   if(mysqlConnect(&conn))
   if(mysqlConnect(&general_info.conn))
+    {
       fprintf(stderr, "%s:%d: mysqlConnect() failed\n", __FILE__, __LINE__);
       return 1;
+    }
   /** pre-loaded jobs for testing */
@@ @@ -205,24 +205,24 @@ int main(int argc, char *argv[]) @@
 	  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, conn); // @TODO: Make sure this actually works.
+      	  finish_frame(general_info.conn, job->jobnum, frame->num); // @TODO: Make sure this actually works.
+      	}
+    }
   distrend_unlisten(general_info.config->listens, clients);
   distrend_config_free(general_info.config);
   xmlcleanup();
   /** free() paths */
   free(general_info.files.geninfo);
   mysqlDisconnect(conn);
+  mysqlDisconnect(general_info.conn);
   return 0;
+}
 /* ********************** Functions ************************* */
@@ @@ -289,13 +289,12 @@ int start_data(struct general_info *gene @@
+    }
   return 0;
+}
 */
 /**
    checks to see if a job is actually done.
    - scans the folder of the job to make sure all output files are present
 */
 // @QUERY: Needs some complex query work

src/server/mysql.c

➞

Show inline comments

@@ @@ -35,13 +35,30 @@ @@
    local types
  */
 #define SEVENTY_FIVE 75
 #define FORTY_TWO 42
 struct distrend_mysql_con
 /**
    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(distrend_mysql_conn_t conn, char *query);
 /**
    frees mysql query result. Accepts a NULL pointer and ignores it to
    help deal with one-shot calls to mysqlQuery so that you don't have to
    check if it returned NULL or not.
    @return 0 on success
  */
 int mysqlResultFree(distrend_mysql_result_t result);
 struct distrend_mysql_conn
+{
   MYSQL *mysqlconn;
   short pointlesscheck;
 };
 struct distrend_mysql_result
@@ @@ -51,13 +68,13 @@ struct distrend_mysql_result @@
 };
 /**
     funcs
  */
-int mysqlConnect(struct distrend_mysql_con **conn)
+int mysqlConnect(distrend_mysql_conn_t *conn)
+{
   MYSQL *mysqlconn;
   char *server = "zserver1";
   char *user = "distren";
   char *password = "secretpassword";
@@ @@ -69,32 +86,32 @@ int mysqlConnect(struct distrend_mysql_c @@
   if(!mysql_real_connect(mysqlconn, server, user, password, database, 0, NULL, 0))
+    {
       fprintf(stderr, "%s\n", mysql_error(mysqlconn));
       return 1;
+    }
-  *conn = malloc(sizeof(struct distrend_mysql_con));
+  *conn = malloc(sizeof(struct distrend_mysql_conn));
   if(!*conn)
+    {
       mysql_close(mysqlconn);
       mysql_server_end();
       return 2;
+    }
   (*conn)->mysqlconn = mysqlconn;
   (*conn)->pointlesscheck = SEVENTY_FIVE;
   return 0;
+}
-int mysqlDisconnect(distrend_mysql_con_t conn)
+int mysqlDisconnect(distrend_mysql_conn_t conn)
+{
   /**
      check if this handle is valid
    */
   if(conn->pointlesscheck != SEVENTY_FIVE)
-    fprintf(stderr, "warning, I was passed a bad struct distrend_mysql_con...\n");
+    fprintf(stderr, "warning, I was passed a bad struct distrend_mysql_conn...\n");
   /**
      invalidate handle :-D
    */
   conn->pointlesscheck ++;
@@ @@ -103,22 +120,22 @@ int mysqlDisconnect(distrend_mysql_con_t @@
   free(conn);
   return 0;
+}
-distrend_mysql_result_t mysqlQuery(distrend_mysql_con_t conn, char *query)
+distrend_mysql_result_t mysqlQuery(distrend_mysql_conn_t conn, char *query)
+{
   MYSQL_RES *result;
   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");
+    fprintf(stderr, "warning, I was passed a bad struct distrend_mysql_conn...\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");
@@ @@ -139,32 +156,48 @@ distrend_mysql_result_t mysqlQuery(distr @@
   return distrenresult;
+}
 int mysqlResultFree(distrend_mysql_result_t result)
+{
   if(!result)
     return 0;
   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;
+}
 <<<<<<< local
 /*
    Individual query functions:
 =======
 /**
    Querying Functions
 >>>>>>> other
  */
 <<<<<<< local
 =======
 /** 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, distrend_mysql_con_t conn)
+{
   MYSQL_RES *result;
   MYSQL_ROW row;
 >>>>>>> other
 <<<<<<< local
 void finish_frame(distrend_mysql_conn_t conn, int32_t jobkey, int32_t framenum)
 =======
   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;
@@ @@ -222,20 +255,41 @@ int change_job_priority(int jobKey, int @@
 /**
   Frame Finder: Finds a frame for a slave to render
 */
 // @QUERY: Frame_Get()
 int find_jobframe(int slaveKey, int *jobKey, int *frameNum, distrend_mysql_con_t conn)
 >>>>>>> other
+{
 <<<<<<< local
   distrend_mysql_result_t result;
   char *query;
 =======
   /*
   if(geninfo->hibernate)
     return 1;
 >>>>>>> other
 <<<<<<< local
   /**
     @TODO record the total rendering time for the frame
    */
 =======
   unsigned int frame_counter;
   unsigned short int found;
 >>>>>>> other
 <<<<<<< local
   _distren_asprintf(&query, "UPDATE `distren`.`Job` SET `Finish_Confirmed`=1 WHERE `Job_Key`=%d AND `Frame`=%d",
 		    jobkey, framenum);
   result = mysqlQuery(conn, query);
   free(query);
   mysqlResultFree(result);
 =======
   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)
+  {
@@ @@ -267,7 +321,8 @@ int find_jobframe(int slaveKey, int *job @@
+    }
   *job = distrenjob_ptr;
   *frame = &distrenjob_ptr->frameset[frame_counter];
 */
   return 0;
 >>>>>>> other
+}

src/server/mysql.h

➞

Show inline comments

@@ @@ -19,44 +19,39 @@ @@
 */
 #ifndef MYSQL_H_
 #define MYSQL_H_
 struct distrend_mysql_con;
 #include <stdint.h>
 struct distrend_mysql_conn;
 struct distrend_mysql_result;
-typedef struct distrend_mysql_con *distrend_mysql_con_t;
+typedef struct distrend_mysql_conn *distrend_mysql_conn_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);
+int mysqlConnect(distrend_mysql_conn_t *conn);
 /**
    cleans and disconnects MySQL connection
    @param conn connection to clean
    @return 0 on success
 */
-int mysqlDisconnect(distrend_mysql_con_t conn);
+int mysqlDisconnect(distrend_mysql_conn_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
    Mark a frame as finished in the database.
  */
-distrend_mysql_result_t mysqlQuery(struct distrend_mysql_con *conn, char *query);
+void finish_frame(distrend_mysql_conn_t conn, int32_t jobkey, int32_t framenum);
 /**
    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, distrend_mysql_con_t conn);
 int change_job_priority(int jobKey, int newPriority, distrend_mysql_con_t conn);

0 comments (0 inline, 0 general)