DistRen Changeset - 5cc750f10d9d · protofusion repositories

Changeset - 5cc750f10d9d

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Nathan Brink (binki) - 16 years ago 2010-02-14 20:31:47
ohnobinki@ohnopublishing.net

fixed stylistic, pointer access, and integer conversion issues

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

@@ @@ -187,49 +187,49 @@ int main(int argc, char *argv[]) @@
       distrend_accept(general_info.config, clients);
       /* Make the following code more event-driven */
       frame_watchdog(&general_info.head);
       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
 	  if(returnnum)
+	    {
 	      fprintf(stderr,"No frames are available to render at this time. Idling...\n");
 	      sleep(10);
+	    }
 	  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(general_info.conn, job->jobnum, frame->num); // @TODO: Make sure this actually works.
+      	  finish_frame(general_info.conn, 0, 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(general_info.conn);
   return 0;
+}
 /* ********************** Functions ************************* */
 /** Dumps all data in RAM to an xml file (such as current jobs, etc) which is parsed by start_data. Remember to invoke this before shutting down! @TODO: Fill this stub*/
 // @QUERY: Obselete function, get rid of me!
 /*
 int xml_dump()
+{
   return 0;
+}

src/server/mysql.c

➞

Show inline comments

@@ @@ -32,48 +32,58 @@ @@
 #include <fcntl.h>
 /**
    local types
  */
 #define SEVENTY_FIVE 75
 #define FORTY_TWO 42
 /**
    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);
 /**
    reads an integer mysql field value
    @return 0 on success
 */
 int distrend_mysql_getint(MYSQL_ROW row, MYSQL_FIELD_OFFSET column, int32_t *theint)
+{
   *theint = atol(row[column]);
   return 0;
+}
 struct distrend_mysql_conn
+{
   MYSQL *mysqlconn;
   short pointlesscheck;
 };
 struct distrend_mysql_result
+{
   MYSQL_RES *mysqlresult;
   short pointlesscheck;
 };
 /**
     funcs
  */
 int mysqlConnect(distrend_mysql_conn_t *conn)
+{
   MYSQL *mysqlconn;
   char *server = "zserver1";
   char *user = "distren";
@@ @@ -207,36 +217,35 @@ int change_job_priority(distrend_mysql_c @@
   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",
 		    slavekey);
   result = mysqlQuery(conn, query);
   free(query);
   if(!result)
     return 1;
   if ((row = mysql_fetch_row(res)) != NULL)
+  {
 	jobkey = row[1];
 	framenum = row[2];
+  }
   else
 	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;
+}

src/server/mysql.h

➞

Show inline comments

@@ @@ -31,40 +31,40 @@ typedef struct distrend_mysql_conn *dist @@
 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_conn_t *conn);
 /**
    cleans and disconnects MySQL connection
    @param conn connection to clean
    @return 0 on success
 */
 int mysqlDisconnect(distrend_mysql_conn_t conn);
 /**
    Mark a frame as finished in the database and calculate the seconds spent on that frame.
  */
 void finish_frame(distrend_mysql_conn_t conn, int32_t slavekey, int32_t jobkey, int32_t framenum);
 /**
    Mark a frame as started in the database and save the time at which it started.
  */
-int start_frame(distrend_mysql_conn_t conn, int32_t slavekey, int32_t jobkey, int32_t framenum);
+void start_frame(distrend_mysql_conn_t conn, int32_t slavekey, int32_t jobkey, int32_t framenum);
 /**
    Changes the priority of an existing (and maybe running) job. @arg head I may end up changing the head if job == head
 */
 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);
 #endif /* MYSQL_H_ */

0 comments (0 inline, 0 general)