DistRen Changeset - 227f5367101a · protofusion repositories

Changeset - 227f5367101a

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Ethan Zonca (ethanzonca) - 16 years ago 2010-02-16 23:00:15
e@ethanzonca.com

Query fixes

2 files changed with 2 insertions and 2 deletions:

src/server/distrend.c

src/server/mysql.c

0 comments (0 inline, 0 general)

src/server/distrend.c

➞

Show inline comments

@@ @@ -428,55 +428,55 @@ int interactiveTest(int test, struct gen @@
   int tmp = 0;
   while(test == 1)
+   {
      fprintf(stderr, "Welcome to DistRen Alpha Interactive Test Mode\n\n");
      fprintf(stderr, "\t1 \tGet a frame to render\n");
      fprintf(stderr, "\t2 \tChange job priority\n");
      fprintf(stderr, "\t3 \tSet frame finished\n");
      fprintf(stderr, "\t4 \tQuit\n");
      scanf("%d", &command);
      switch(command)
+     {
      case 1:
        fprintf(stderr, "Got frame: ");
        find_jobframe(conn, slaveKey, jobKey, frameNum);
        fprintf(stderr, "jobKey: %d, frameNum: %d\n",jobKey,frameNum);
        break;
      case 2:
        fprintf(stderr,"Job key: ");
        scanf("%d", &tmp);
        jobKey = tmp;
        fprintf(stderr,"New priority: ");
        scanf("%d", &tmp);
        newPriority = tmp;
        change_job_priority(conn, jobKey, newPriority);
        fprintf(stderr,"Changed!");
        break;
      case 3:
        fprintf(stderr,"Slave Key: ");
        scanf("%d", &tmp);
        slaveKey = tmp;
        fprintf(stderr,"Job Key: ");
        scanf("%d", &tmp);
        jobKey = tmp;
        fprintf(stderr,"Frame Number: ");
        scanf("%d", &tmp);
        frameNum = tmp;
        finish_frame(conn, slaveKey, jobKey, frameNum);
        fprintf(stderr,"Finished Frame!\n");
        break;
      case 4:
-       return 0;
+       test = 0;
        break;
+     }
   return 0;
+   }
   return 0;
+}

src/server/mysql.c

➞

Show inline comments

@@ @@ -185,67 +185,67 @@ int mysqlResultFree(distrend_mysql_resul @@
    Individual query functions:
  */
 void finish_frame(distrend_mysql_conn_t conn, int32_t slavekey, int32_t jobkey, int32_t framenum)
+{
   char *query;
   distrend_mysql_result_t result;
   _distren_asprintf(&query, "CALL `distren`.`Frame_Complete`(%d,%d,%d);", slavekey, jobkey, framenum);
   result = mysqlQuery(conn, query);
   free(query);
   mysqlResultFree(result);
+}
 void start_frame(distrend_mysql_conn_t conn, int32_t slavekey, int32_t jobkey, int32_t framenum)
+{
   char *query;
   distrend_mysql_result_t result;
   _distren_asprintf(&query, "CALL `distren`.`Frame_Start`(%d,%d,%d);", slavekey, jobkey, framenum);
   result = mysqlQuery(conn, query);
   free(query);
   mysqlResultFree(result);
+}
 int change_job_priority(distrend_mysql_conn_t conn, int32_t jobkey, int32_t newpriority)
+{
   char *query;
   distrend_mysql_result_t result;
   _distren_asprintf(&query, "UPDATE `distren`.`Job` SET `Priority`=%d WHERE `Job_Key`=%d",
 		    newpriority, jobkey);
   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)
+{
   distrend_mysql_result_t result;
   char *query;
   MYSQL_ROW row;
-  _distren_asprintf(&query, "`distren`.`Frame_Get`( %d, @Job_Key, @Frame_Key); SELECT @Job_Key, @Frame_Key",
   _distren_asprintf(&query, "`distren`.`Frame_Get`( %d, @Job_Key, @Frame_Key) SELECT @Job_Key, @Frame_Key",
 		    slavekey);
   result = mysqlQuery(conn, query);
   free(query);
   if(!result)
     return 1;
   row = mysql_fetch_row(result->mysqlresult);
   if(!row)
     return 1;
   distrend_mysql_getint(row, 1, &jobkey);
   distrend_mysql_getint(row, 2, &framenum);
   mysqlResultFree(result);
   return 0;
+}

0 comments (0 inline, 0 general)