Files
@ f5a1573ebc08
Branch filter:
Location: DistRen/src/server/mysql.c - annotation
f5a1573ebc08
8.0 KiB
text/plain
fix up finish_frame() into mysql.c, reorganize mysql.? a bit
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 | 742325b16d40 742325b16d40 742325b16d40 742325b16d40 742325b16d40 742325b16d40 742325b16d40 742325b16d40 742325b16d40 742325b16d40 742325b16d40 742325b16d40 742325b16d40 742325b16d40 742325b16d40 742325b16d40 742325b16d40 742325b16d40 742325b16d40 742325b16d40 742325b16d40 742325b16d40 742325b16d40 742325b16d40 a1fb4d1ec4fa 742325b16d40 742325b16d40 742325b16d40 742325b16d40 742325b16d40 742325b16d40 742325b16d40 742325b16d40 9b974d776960 9b974d776960 9b974d776960 9b974d776960 9b974d776960 d5f4334ff4e6 9b974d776960 f5a1573ebc08 f5a1573ebc08 f5a1573ebc08 f5a1573ebc08 f5a1573ebc08 f5a1573ebc08 f5a1573ebc08 f5a1573ebc08 f5a1573ebc08 f5a1573ebc08 f5a1573ebc08 f5a1573ebc08 f5a1573ebc08 f5a1573ebc08 f5a1573ebc08 f5a1573ebc08 f5a1573ebc08 f5a1573ebc08 9b974d776960 9b974d776960 9b974d776960 9b974d776960 9b974d776960 9b974d776960 9b974d776960 d5f4334ff4e6 d5f4334ff4e6 9b974d776960 9b974d776960 9b974d776960 9b974d776960 9b974d776960 9b974d776960 f5a1573ebc08 9b974d776960 9b974d776960 742325b16d40 742325b16d40 742325b16d40 742325b16d40 742325b16d40 742325b16d40 9b974d776960 9b974d776960 742325b16d40 9b974d776960 9b974d776960 9b974d776960 9b974d776960 9b974d776960 742325b16d40 f5a1573ebc08 d5f4334ff4e6 d5f4334ff4e6 d5f4334ff4e6 d5f4334ff4e6 d5f4334ff4e6 d5f4334ff4e6 9b974d776960 9b974d776960 9b974d776960 9b974d776960 742325b16d40 742325b16d40 f5a1573ebc08 9b974d776960 9b974d776960 9b974d776960 9b974d776960 9b974d776960 f5a1573ebc08 742325b16d40 9b974d776960 9b974d776960 9b974d776960 9b974d776960 9b974d776960 9b974d776960 d5f4334ff4e6 9b974d776960 9b974d776960 9b974d776960 742325b16d40 742325b16d40 17ee4de48309 f5a1573ebc08 9b974d776960 9b974d776960 9b974d776960 9b974d776960 9b974d776960 9b974d776960 9b974d776960 9b974d776960 f5a1573ebc08 9b974d776960 9b974d776960 9b974d776960 9b974d776960 9b974d776960 9b974d776960 9b974d776960 9b974d776960 9b974d776960 9b974d776960 9b974d776960 9b974d776960 d5f4334ff4e6 d5f4334ff4e6 d5f4334ff4e6 d5f4334ff4e6 d5f4334ff4e6 d5f4334ff4e6 d5f4334ff4e6 d5f4334ff4e6 d5f4334ff4e6 9b974d776960 9b974d776960 9b974d776960 d5f4334ff4e6 d5f4334ff4e6 f5a1573ebc08 f5a1573ebc08 f5a1573ebc08 d5f4334ff4e6 d5f4334ff4e6 d5f4334ff4e6 d5f4334ff4e6 d5f4334ff4e6 d5f4334ff4e6 d5f4334ff4e6 d5f4334ff4e6 a1fb4d1ec4fa f5a1573ebc08 f5a1573ebc08 f5a1573ebc08 f5a1573ebc08 f5a1573ebc08 f5a1573ebc08 a1fb4d1ec4fa a1fb4d1ec4fa f5a1573ebc08 a1fb4d1ec4fa a1fb4d1ec4fa f5a1573ebc08 f5a1573ebc08 a1fb4d1ec4fa a1fb4d1ec4fa 3de305a5a38f a1fb4d1ec4fa 3de305a5a38f 3de305a5a38f f5a1573ebc08 3de305a5a38f f5a1573ebc08 f5a1573ebc08 f5a1573ebc08 3de305a5a38f 3de305a5a38f 3de305a5a38f a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa 3de305a5a38f a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa 3de305a5a38f a1fb4d1ec4fa a1fb4d1ec4fa 3de305a5a38f f5a1573ebc08 a1fb4d1ec4fa f5a1573ebc08 f5a1573ebc08 f5a1573ebc08 f5a1573ebc08 a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa f5a1573ebc08 a1fb4d1ec4fa f5a1573ebc08 f5a1573ebc08 f5a1573ebc08 f5a1573ebc08 f5a1573ebc08 a1fb4d1ec4fa a1fb4d1ec4fa f5a1573ebc08 a1fb4d1ec4fa f5a1573ebc08 f5a1573ebc08 f5a1573ebc08 f5a1573ebc08 f5a1573ebc08 f5a1573ebc08 f5a1573ebc08 f5a1573ebc08 f5a1573ebc08 a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa a1fb4d1ec4fa f5a1573ebc08 a1fb4d1ec4fa | /*
Copyright 2009 Nathan Phillip Brink, Ethan Zonca, Matthew Orlando
This file is a part of DistRen.
DistRen is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
DistRen is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with DistRen. If not, see <http://www.gnu.org/licenses/>.
*/
#include "mysql.h"
#include <mysql/mysql.h>
#include "common/asprintf.h"
#include "common/protocol.h"
#include <stdio.h>
#include <string.h>
#include <unistd.h>
#include <stdlib.h>
#include <sys/stat.h>
#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);
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";
char *password = "secretpassword";
char *database = "distren";
mysqlconn = mysql_init(NULL);
mysql_options(mysqlconn, MYSQL_OPT_RECONNECT,"true");
if(!mysql_real_connect(mysqlconn, server, user, password, database, 0, NULL, 0))
{
fprintf(stderr, "%s\n", mysql_error(mysqlconn));
return 1;
}
*conn = malloc(sizeof(struct distrend_mysql_conn));
if(!*conn)
{
mysql_close(mysqlconn);
mysql_server_end();
return 2;
}
(*conn)->mysqlconn = mysqlconn;
(*conn)->pointlesscheck = SEVENTY_FIVE;
return 0;
}
int mysqlDisconnect(distrend_mysql_conn_t conn)
{
/**
check if this handle is valid
*/
if(conn->pointlesscheck != SEVENTY_FIVE)
fprintf(stderr, "warning, I was passed a bad struct distrend_mysql_conn...\n");
/**
invalidate handle :-D
*/
conn->pointlesscheck ++;
mysql_close(conn->mysqlconn);
mysql_server_end();
free(conn);
return 0;
}
distrend_mysql_result_t mysqlQuery(distrend_mysql_conn_t conn, char *query)
{
MYSQL_RES *result;
distrend_mysql_result_t distrenresult;
/**
pointless sanity check
*/
if(conn->pointlesscheck != SEVENTY_FIVE)
fprintf(stderr, "warning, I was passed a bad struct distrend_mysql_conn...\n");
/** make sure that connection is still alive
*/
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;
}
<<<<<<< local
/*
Individual query functions:
=======
/**
Querying Functions
>>>>>>> other
*/
<<<<<<< local
=======
/** Finish-Setter: Sets a frame to the "completed" status.*/
// @QUERY: update `distren`.`Job` set `Finish_Confirmed`=1 where `Job_Key`='1' and `Frame` = somenumber;
void finish_frame(int slaveKey, int jobKey, int frameNum, distrend_mysql_con_t conn)
{
MYSQL_RES *result;
MYSQL_ROW row;
>>>>>>> other
<<<<<<< local
void finish_frame(distrend_mysql_conn_t conn, int32_t jobkey, int32_t framenum)
=======
char *query = "update `distren`.`Job` set `Finish_Confirmed`=1 where `Job_Key`='1' and `Frame` = somenumber;";
result = mysqlQuery(conn, query);
// Check to make sure the slavekey is the one who rendered the frame before finishing :D
/*
distrenjob->frameset[frame].status = FRAMESETSTATUS_DONE;
distrenjob->total_render_time = distrenjob->total_render_time + (clock() - distrenjob->frameset[frame].start_time);
distrenjob->completed_frames ++;
distrenjob->assigned_frames --;
geninfo->total_frames_rendered ++; //< Increase total frames var for stats
update_general_info(geninfo);
updateJobStatsXML(distrenjob);
*/
}
/** Changes the priority of an existing (and maybe running) job. @arg head I may end up changing the head if job == head */
// @QUERY: update `distren`.`Job` set `Priority`='12', `Finish_Confirmed`=1 where `Job_Key`='1';
int change_job_priority(int jobKey, int newPriority, distrend_mysql_con_t conn){
/*
struct distrenjob *current_job;
struct distrenjob *prev_job;
char *serialname;
distrenjob_remove(geninfo, job);
job->priority = new_priority;
prev_job = &geninfo->head;
if(job->frameset[0].status == FRAMESETSTATUS_UNASSIGNED)
// if job was not yet started
{
distrenjob_enqueue(geninfo, job);
return 0;
}
// iterate through linked list of jobs
for(current_job = &geninfo->head;
current_job != NULL
&& job->priority > current_job->priority;
current_job = current_job->next)
prev_job = current_job;
prev_job->next = job;
job->next = current_job;
update_xml_joblist(geninfo);
// reserialize after changes
job_getserialfilename(&serialname, geninfo, job->jobnum, 0);
distrenjob_serialize(job, serialname);
free(serialname);
*/
return 0;
}
/**
Frame Finder: Finds a frame for a slave to render
*/
// @QUERY: Frame_Get()
int find_jobframe(int slaveKey, int *jobKey, int *frameNum, distrend_mysql_con_t conn)
>>>>>>> other
{
<<<<<<< local
distrend_mysql_result_t result;
char *query;
=======
/*
if(geninfo->hibernate)
return 1;
>>>>>>> other
<<<<<<< local
/**
@TODO record the total rendering time for the frame
*/
=======
unsigned int frame_counter;
unsigned short int found;
>>>>>>> other
<<<<<<< local
_distren_asprintf(&query, "UPDATE `distren`.`Job` SET `Finish_Confirmed`=1 WHERE `Job_Key`=%d AND `Frame`=%d",
jobkey, framenum);
result = mysqlQuery(conn, query);
free(query);
mysqlResultFree(result);
=======
struct distrenjob *distrenjob_ptr;
found = 0;
// iterate through jobs from first to last
for(distrenjob_ptr = geninfo->head.next; distrenjob_ptr && !distrenjob_ptr->hibernate; distrenjob_ptr = distrenjob_ptr->next)
{
for(frame_counter = (distrenjob_ptr->prev_frame_index + 1); frame_counter < distrenjob_ptr->total_frames; frame_counter ++)
{
if(distrenjob_ptr->frameset[frame_counter].status == FRAMESETSTATUS_UNASSIGNED) // jobframe found
{
found = 1;
distrenjob_ptr->frameset[frame_counter].status = FRAMESETSTATUS_ASSIGNED;
distrenjob_ptr->frameset[frame_counter].start_time = clock();
distrenjob_ptr->assigned_frames++;
distrenjob_ptr->prev_frame_index = frame_counter;
updateJobStatsXML(distrenjob_ptr);
}
if(found)
break;
}
if(found)
break;
}
if(!found)
{
fprintf(stderr, "No more jobs to render\n");
sleep(1); //< @todo eliminate the need for this line
return 1;
}
*job = distrenjob_ptr;
*frame = &distrenjob_ptr->frameset[frame_counter];
*/
return 0;
>>>>>>> other
}
|