DistRen Changeset - 12d457aff611 · protofusion repositories

Changeset - 12d457aff611

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

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

fix find_jobframe() call for real

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

@@ @@ -162,13 +162,13 @@ int main(int argc, char *argv[]) @@
       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(general_info.conn, slaveKey, job->jobnum, frame->num); // Finds a frame to render @FIXME: Slavenum :D
+	  int returnnum = find_jobframe(general_info.conn, slaveKey, &job->jobnum, &frame->num); // 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
@@ @@ -419,13 +419,13 @@ int update_xml_joblist(struct general_in @@
 /** Interactive test for the queuing system */
 /* @QUEUE: Test uses methods not present in C code using mysql web-based system */
 int interactiveTest(int test, struct general_info general_info, distrend_mysql_conn_t conn){
   int command;
   fprintf(stderr,"Hello!\n");
   int32_t slaveKey = 1;
-  int32_t jobKey = 0;
+  jobnum_t jobKey = 0;
   int32_t frameNum = 0;
   int32_t newPriority = 0;
   int tmp = 0;
   while(test == 1)
+   {

src/server/mysql.c

➞

Show inline comments

@@ @@ -241,13 +241,13 @@ int change_job_priority(distrend_mysql_c @@
   result = mysqlQuery(conn, query);
   mysqlResultFree(result);
   return 0;
+}
-int find_jobframe(distrend_mysql_conn_t conn, int32_t slavekey, int32_t *jobkey, int32_t *framenum)
+int find_jobframe(distrend_mysql_conn_t conn, int32_t slavekey, jobnum_t *jobkey, int32_t *framenum)
+{
   distrend_mysql_result_t result;
   char *query;
   MYSQL_ROW row;
   _distren_asprintf(&query, "CALL `distren`.`Frame_Get`(%d);", slavekey);
@@ @@ -262,13 +262,13 @@ int find_jobframe(distrend_mysql_conn_t @@
   if(!row)
+    {
       mysqlResultFree(result);
       return 1;
+    }
   distrend_mysql_getint(row, 0, jobkey);
+  distrend_mysql_getint(row, 0, (int32_t *)jobkey);
   distrend_mysql_getint(row, 1, framenum);
   mysqlResultFree(result);

src/server/mysql.h

➞

Show inline comments

@@ @@ -19,12 +19,14 @@ @@
 */
 #ifndef MYSQL_H_
 #define MYSQL_H_
 #include "distrenjob.h"
 #include <stdint.h>
 struct distrend_mysql_conn;
 struct distrend_mysql_result;
 typedef struct distrend_mysql_conn *distrend_mysql_conn_t;
@@ @@ -59,12 +61,12 @@ void start_frame(distrend_mysql_conn_t c @@
 */
 int change_job_priority(distrend_mysql_conn_t conn, int32_t jobkey, int32_t newpriority);
 /**
   Frame Finder: Finds a frame for a slave to render
 */
-int find_jobframe(distrend_mysql_conn_t conn, int32_t slaveKey, int32_t *jobKey, int32_t *frameNum);
+int find_jobframe(distrend_mysql_conn_t conn, int32_t slaveKey, jobnum_t *jobKey, int32_t *frameNum);
 #endif /* MYSQL_H_ */

0 comments (0 inline, 0 general)