DistRen Changeset - 66fd3b9ad6c2 · protofusion repositories

Changeset - 66fd3b9ad6c2

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Ethan Zonca (ethanzonca) - 16 years ago 2010-02-18 00:01:56
e@ethanzonca.com

test

2 files changed with 5 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

@@ @@ -402,101 +402,102 @@ int update_xml_joblist(struct general_in @@
   xmlTextWriterEndElement(writer);
   /**
      close elements and end document
   */
   xmlTextWriterEndDocument(writer);
   /**
      free writer and save xml file to disk
   */
   xmlFreeTextWriter(writer);
   return 0;
+}
 /* ************************** Test Functions ************************* */
 /** 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;
   int32_t frameNum = 0;
   int32_t newPriority = 0;
   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 \tSet frame started\n");
      fprintf(stderr, "\t5 \tQuit\n");
      scanf("%d", &command);
      switch(command)
+     {
      case 1:
        fprintf(stderr,"Slave Key: ");
        scanf("%d", &slaveKey);
        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:
        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;
        start_frame(conn, slaveKey, jobKey, frameNum);
        fprintf(stderr,"Started Frame!\n");
        break;
      case 5:
        test = 0;
        break;
      default:
        fprintf(stderr, "Invalid input, please try again.\n");
        break;
+     }
+   }
   return 0;
+}

src/server/mysql.c

➞

Show inline comments

@@ @@ -149,103 +149,105 @@ distrend_mysql_result_t mysqlQuery(distr @@
   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)
     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;
+}
 /*
    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, "CALL `distren`.`Frame_Get`(%d);", 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);
   // distrend_mysql_getint(row, 1, &jobkey);
   // distrend_mysql_getint(row, 2, &framenum);
   jobkey = row[0];
   framenum = row[1];
   mysqlResultFree(result);
   return 0;
+}

0 comments (0 inline, 0 general)