diff --git a/src/server/distrend.c b/src/server/distrend.c --- a/src/server/distrend.c +++ b/src/server/distrend.c @@ -51,6 +51,7 @@ struct general_info { struct distrenjob head; + distrend_mysql_conn_t conn; struct distrend_config *config; @@ -81,7 +82,7 @@ struct general_info /* ************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); @@ -163,8 +164,7 @@ int main(int argc, char *argv[]) */ /** 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; @@ -208,7 +208,7 @@ int main(int argc, char *argv[]) /* 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. } } @@ -219,7 +219,7 @@ int main(int argc, char *argv[]) /** free() paths */ free(general_info.files.geninfo); - mysqlDisconnect(conn); + mysqlDisconnect(general_info.conn); return 0; } @@ -292,7 +292,6 @@ int start_data(struct general_info *gene } */ - /** checks to see if a job is actually done. - scans the folder of the job to make sure all output files are present