DistRen Changeset - 17ee4de48309 · protofusion repositories

Changeset - 17ee4de48309

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Ethan Zonca (ethanzonca) - 16 years ago 2010-02-09 19:52:41
e@ethanzonca.com

Added mysql wrapper calls

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

@@ @@ -163,6 +163,10 @@ int main(int argc, char *argv[]) @@
       return 1;
+    }
   /** MySQL Connection */
   MYSQL *conn;
   *conn = mysqlConnect();
   /** pre-loaded jobs for testing */
   prepare_distrenjob(&general_info, 1, "awesome", "LordOfWar", 8, 1, 100, 640, 480);
   prepare_distrenjob(&general_info, 1, "hamburger", "ohnobinki", 3, 1, 50, 1280, 720);
@@ @@ -202,6 +206,8 @@ int main(int argc, char *argv[]) @@
       	  clientstatus = CLIENTSTATUS_IDLE; // Sets the client back to idle
       	  finish_frame(&general_info, job, frame->num); // @TODO: Make sure this actually works.
+      	}
       	// Check the connection to the database
       	mysqlPing(conn);
     } /* while(!general_info.config->die) */
   distrend_unlisten(general_info.config->listens, clients);
@@ @@ -211,6 +217,7 @@ int main(int argc, char *argv[]) @@
   /** free() paths */
   free(general_info.files.geninfo);
   mysql_close(conn);
   return 0;
+}

src/server/mysql.c

➞

Show inline comments

@@ @@ -66,8 +66,4 @@ int mysqlPing(MYSQL *conn){ @@
     return 0; // Connection is still alive
+}
 int mysqlFree(MYSQL_RES *res, MYSQL *conn){
   mysql_free_result(res);
   mysql_close(conn);
   return 0;
+}

src/server/mysql.h

➞

Show inline comments

@@ @@ -26,7 +26,6 @@ @@
 MYSQL mysqlConnect();
 MYSQL_RES mysqlQuery(MYSQL *conn, char *query);
 MYSQL_RES mysqlQuery(MYSQL *conn, char *query);
 int mysqlFree(MYSQL_RES *res, MYSQL *conn);
 int mysqlPing(MYSQL *conn);
 #endif /* MYSQL_H_ */

0 comments (0 inline, 0 general)