ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Mute cheevos logging, define CHEEVOS_VERBOSE in cheevos.h to enable

This commit is contained in:
Andre Leiradella 2018-04-25 17:56:15 +01:00
parent 023e280319
commit 029ba3d2f6
4 changed files with 103 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

176
cheevos/cheevos.c
View File

@ -310,7 +310,7 @@ static unsigned size_in_megabytes(unsigned val)
static void cheevos_log_url(const char* format, const char* url) static void cheevos_log_url(const char* format, const char* url)
{ {
#ifdef CHEEVOS_LOG_PASSWORD #ifdef CHEEVOS_LOG_PASSWORD
RARCH_LOG(format, url); CHEEVOS_LOG(format, url);
#else #else
char copy[256]; char copy[256];
char* aux = NULL; char* aux = NULL;
@ -361,7 +361,7 @@ static void cheevos_log_url(const char* format, const char* url)
*aux = 0; *aux = 0;
} }
RARCH_LOG(format, copy); CHEEVOS_LOG(format, copy);
#endif #endif
} }
#endif #endif
@ -424,7 +424,7 @@ static void cheevos_log_var(const cheevos_var_t* var)
if (!var) if (!var)
return; return;
RARCH_LOG("[CHEEVOS]: size: %s\n", CHEEVOS_LOG("[CHEEVOS]: size: %s\n",
var->size == CHEEVOS_VAR_SIZE_BIT_0 ? "bit 0" : var->size == CHEEVOS_VAR_SIZE_BIT_0 ? "bit 0" :
var->size == CHEEVOS_VAR_SIZE_BIT_1 ? "bit 1" : var->size == CHEEVOS_VAR_SIZE_BIT_1 ? "bit 1" :
var->size == CHEEVOS_VAR_SIZE_BIT_2 ? "bit 2" : var->size == CHEEVOS_VAR_SIZE_BIT_2 ? "bit 2" :
@ -440,14 +440,14 @@ static void cheevos_log_var(const cheevos_var_t* var)
var->size == CHEEVOS_VAR_SIZE_THIRTYTWO_BITS ? "dword" : var->size == CHEEVOS_VAR_SIZE_THIRTYTWO_BITS ? "dword" :
"?" "?"
); );
RARCH_LOG("[CHEEVOS]: type: %s\n", CHEEVOS_LOG("[CHEEVOS]: type: %s\n",
var->type == CHEEVOS_VAR_TYPE_ADDRESS ? "address" : var->type == CHEEVOS_VAR_TYPE_ADDRESS ? "address" :
var->type == CHEEVOS_VAR_TYPE_VALUE_COMP ? "value" : var->type == CHEEVOS_VAR_TYPE_VALUE_COMP ? "value" :
var->type == CHEEVOS_VAR_TYPE_DELTA_MEM ? "delta" : var->type == CHEEVOS_VAR_TYPE_DELTA_MEM ? "delta" :
var->type == CHEEVOS_VAR_TYPE_DYNAMIC_VAR ? "dynamic" : var->type == CHEEVOS_VAR_TYPE_DYNAMIC_VAR ? "dynamic" :
"?" "?"
); );
RARCH_LOG("[CHEEVOS]: value: %u\n", var->value); CHEEVOS_LOG("[CHEEVOS]: value: %u\n", var->value);
} }
static void cheevos_log_cond(const cheevos_cond_t* cond) static void cheevos_log_cond(const cheevos_cond_t* cond)
@ -455,8 +455,8 @@ static void cheevos_log_cond(const cheevos_cond_t* cond)
if (!cond) if (!cond)
return; return;
RARCH_LOG("[CHEEVOS]: condition %p\n", cond); CHEEVOS_LOG("[CHEEVOS]: condition %p\n", cond);
RARCH_LOG("[CHEEVOS]: type: %s\n", CHEEVOS_LOG("[CHEEVOS]: type: %s\n",
cond->type == CHEEVOS_COND_TYPE_STANDARD ? "standard" : cond->type == CHEEVOS_COND_TYPE_STANDARD ? "standard" :
cond->type == CHEEVOS_COND_TYPE_PAUSE_IF ? "pause" : cond->type == CHEEVOS_COND_TYPE_PAUSE_IF ? "pause" :
cond->type == CHEEVOS_COND_TYPE_RESET_IF ? "reset" : cond->type == CHEEVOS_COND_TYPE_RESET_IF ? "reset" :
@ -465,10 +465,10 @@ static void cheevos_log_cond(const cheevos_cond_t* cond)
cond->type == CHEEVOS_COND_TYPE_ADD_HITS ? "add hits" : cond->type == CHEEVOS_COND_TYPE_ADD_HITS ? "add hits" :
"?" "?"
); );
RARCH_LOG("[CHEEVOS]: req_hits: %u\n", cond->req_hits); CHEEVOS_LOG("[CHEEVOS]: req_hits: %u\n", cond->req_hits);
RARCH_LOG("[CHEEVOS]: source:\n"); CHEEVOS_LOG("[CHEEVOS]: source:\n");
cheevos_log_var(&cond->source); cheevos_log_var(&cond->source);
RARCH_LOG("[CHEEVOS]: op: %s\n", CHEEVOS_LOG("[CHEEVOS]: op: %s\n",
cond->op == CHEEVOS_COND_OP_EQUALS ? "==" : cond->op == CHEEVOS_COND_OP_EQUALS ? "==" :
cond->op == CHEEVOS_COND_OP_LESS_THAN ? "<" : cond->op == CHEEVOS_COND_OP_LESS_THAN ? "<" :
cond->op == CHEEVOS_COND_OP_LESS_THAN_OR_EQUAL ? "<=" : cond->op == CHEEVOS_COND_OP_LESS_THAN_OR_EQUAL ? "<=" :
@ -477,7 +477,7 @@ static void cheevos_log_cond(const cheevos_cond_t* cond)
cond->op == CHEEVOS_COND_OP_NOT_EQUAL_TO ? "!=" : cond->op == CHEEVOS_COND_OP_NOT_EQUAL_TO ? "!=" :
"?" "?"
); );
RARCH_LOG("[CHEEVOS]: target:\n"); CHEEVOS_LOG("[CHEEVOS]: target:\n");
cheevos_log_var(&cond->target); cheevos_log_var(&cond->target);
} }
@ -487,15 +487,15 @@ static void cheevos_log_cheevo(const cheevo_t* cheevo,
if (!cheevo || !memaddr_ud) if (!cheevo || !memaddr_ud)
return; return;
RARCH_LOG("[CHEEVOS]: cheevo %p\n", cheevo); CHEEVOS_LOG("[CHEEVOS]: cheevo %p\n", cheevo);
RARCH_LOG("[CHEEVOS]: id: %u\n", cheevo->id); CHEEVOS_LOG("[CHEEVOS]: id: %u\n", cheevo->id);
RARCH_LOG("[CHEEVOS]: title: %s\n", cheevo->title); CHEEVOS_LOG("[CHEEVOS]: title: %s\n", cheevo->title);
RARCH_LOG("[CHEEVOS]: desc: %s\n", cheevo->description); CHEEVOS_LOG("[CHEEVOS]: desc: %s\n", cheevo->description);
RARCH_LOG("[CHEEVOS]: author: %s\n", cheevo->author); CHEEVOS_LOG("[CHEEVOS]: author: %s\n", cheevo->author);
RARCH_LOG("[CHEEVOS]: badge: %s\n", cheevo->badge); CHEEVOS_LOG("[CHEEVOS]: badge: %s\n", cheevo->badge);
RARCH_LOG("[CHEEVOS]: points: %u\n", cheevo->points); CHEEVOS_LOG("[CHEEVOS]: points: %u\n", cheevo->points);
RARCH_LOG("[CHEEVOS]: sets: TBD\n"); CHEEVOS_LOG("[CHEEVOS]: sets: TBD\n");
RARCH_LOG("[CHEEVOS]: memaddr: %.*s\n", CHEEVOS_LOG("[CHEEVOS]: memaddr: %.*s\n",
(int)memaddr_ud->length, memaddr_ud->string); (int)memaddr_ud->length, memaddr_ud->string);
} }
@ -651,7 +651,7 @@ static void cheevos_post_log_cheevo(const cheevo_t* cheevo)
if (!cheevo) if (!cheevo)
return; return;
cheevos_build_memaddr(&cheevo->condition, memaddr, sizeof(memaddr)); cheevos_build_memaddr(&cheevo->condition, memaddr, sizeof(memaddr));
RARCH_LOG("[CHEEVOS]: memaddr (computed): %s\n", memaddr); CHEEVOS_LOG("[CHEEVOS]: memaddr (computed): %s\n", memaddr);
} }
static void cheevos_log_lboard(const cheevos_leaderboard_t* lb) static void cheevos_log_lboard(const cheevos_leaderboard_t* lb)
@ -664,19 +664,19 @@ static void cheevos_log_lboard(const cheevos_leaderboard_t* lb)
if (!lb) if (!lb)
return; return;
RARCH_LOG("[CHEEVOS]: leaderboard %p\n", lb); CHEEVOS_LOG("[CHEEVOS]: leaderboard %p\n", lb);
RARCH_LOG("[CHEEVOS]: id: %u\n", lb->id); CHEEVOS_LOG("[CHEEVOS]: id: %u\n", lb->id);
RARCH_LOG("[CHEEVOS]: title: %s\n", lb->title); CHEEVOS_LOG("[CHEEVOS]: title: %s\n", lb->title);
RARCH_LOG("[CHEEVOS]: desc: %s\n", lb->description); CHEEVOS_LOG("[CHEEVOS]: desc: %s\n", lb->description);
cheevos_build_memaddr(&lb->start, mem, sizeof(mem)); cheevos_build_memaddr(&lb->start, mem, sizeof(mem));
RARCH_LOG("[CHEEVOS]: start: %s\n", mem); CHEEVOS_LOG("[CHEEVOS]: start: %s\n", mem);
cheevos_build_memaddr(&lb->cancel, mem, sizeof(mem)); cheevos_build_memaddr(&lb->cancel, mem, sizeof(mem));
RARCH_LOG("[CHEEVOS]: cancel: %s\n", mem); CHEEVOS_LOG("[CHEEVOS]: cancel: %s\n", mem);
cheevos_build_memaddr(&lb->submit, mem, sizeof(mem)); cheevos_build_memaddr(&lb->submit, mem, sizeof(mem));
RARCH_LOG("[CHEEVOS]: submit: %s\n", mem); CHEEVOS_LOG("[CHEEVOS]: submit: %s\n", mem);
left = sizeof(mem); left = sizeof(mem);
aux = mem; aux = mem;
@ -691,7 +691,7 @@ static void cheevos_log_lboard(const cheevos_leaderboard_t* lb)
cheevos_add_int(&aux, &left, lb->value.terms[i].multiplier); cheevos_add_int(&aux, &left, lb->value.terms[i].multiplier);
} }
RARCH_LOG("[CHEEVOS]: value: %s\n", mem); CHEEVOS_LOG("[CHEEVOS]: value: %s\n", mem);
} }
#endif #endif
@ -964,10 +964,8 @@ static int cheevos_parse_condition(
cheevos_cond_count_in_set(memaddr, set); cheevos_cond_count_in_set(memaddr, set);
condset->conds = NULL; condset->conds = NULL;
#ifdef CHEEVOS_VERBOSE CHEEVOS_LOG("[CHEEVOS]: set %p (index=%u)\n", condset, set);
RARCH_LOG("[CHEEVOS]: set %p (index=%u)\n", condset, set); CHEEVOS_LOG("[CHEEVOS]: conds: %u\n", condset->count);
RARCH_LOG("[CHEEVOS]: conds: %u\n", condset->count);
#endif
if (condset->count) if (condset->count)
{ {
@ -1896,14 +1894,14 @@ static void cheevos_unlocked(void *task_data, void *user_data,
if (!error) if (!error)
{ {
RARCH_LOG("[CHEEVOS]: awarded achievement %u.\n", cheevo->id); CHEEVOS_LOG("[CHEEVOS]: awarded achievement %u.\n", cheevo->id);
} }
else else
{ {
char url[256]; char url[256];
url[0] = '\0'; url[0] = '\0';
RARCH_ERR("[CHEEVOS]: error awarding achievement %u, retrying...\n", cheevo->id); CHEEVOS_ERR("[CHEEVOS]: error awarding achievement %u, retrying...\n", cheevo->id);
cheevos_make_unlock_url(cheevo, url, sizeof(url)); cheevos_make_unlock_url(cheevo, url, sizeof(url));
task_push_http_transfer(url, true, NULL, cheevos_unlocked, cheevo); task_push_http_transfer(url, true, NULL, cheevos_unlocked, cheevo);
@ -1951,7 +1949,7 @@ static void cheevos_test_cheevo_set(const cheevoset_t *set)
if (mode == CHEEVOS_ACTIVE_HARDCORE) if (mode == CHEEVOS_ACTIVE_HARDCORE)
cheevo->active &= ~CHEEVOS_ACTIVE_SOFTCORE; cheevo->active &= ~CHEEVOS_ACTIVE_SOFTCORE;
RARCH_LOG("[CHEEVOS]: awarding cheevo %u: %s (%s).\n", CHEEVOS_LOG("[CHEEVOS]: awarding cheevo %u: %s (%s).\n",
cheevo->id, cheevo->title, cheevo->description); cheevo->id, cheevo->title, cheevo->description);
snprintf(msg, sizeof(msg), "Achievement Unlocked: %s", snprintf(msg, sizeof(msg), "Achievement Unlocked: %s",
@ -1976,9 +1974,9 @@ static void cheevos_test_cheevo_set(const cheevoset_t *set)
if (take_screenshot(shotname, true, if (take_screenshot(shotname, true,
video_driver_cached_frame_has_valid_framebuffer())) video_driver_cached_frame_has_valid_framebuffer()))
RARCH_LOG("[CHEEVOS]: got a screenshot for cheevo %u\n", cheevo->id); CHEEVOS_LOG("[CHEEVOS]: got a screenshot for cheevo %u\n", cheevo->id);
else else
RARCH_LOG("[CHEEVOS]: failed to get screenshot for cheevo %u\n", cheevo->id); CHEEVOS_LOG("[CHEEVOS]: failed to get screenshot for cheevo %u\n", cheevo->id);
} }
} }
@ -2044,7 +2042,7 @@ static int cheevos_expr_value(cheevos_expr_t* expr)
if (expr->compare_count >= ARRAY_SIZE(values)) if (expr->compare_count >= ARRAY_SIZE(values))
{ {
RARCH_ERR("[CHEEVOS]: too many values in the leaderboard expression: %u\n", expr->compare_count); CHEEVOS_ERR("[CHEEVOS]: too many values in the leaderboard expression: %u\n", expr->compare_count);
return 0; return 0;
} }
@ -2054,7 +2052,7 @@ static int cheevos_expr_value(cheevos_expr_t* expr)
{ {
if (current_value >= ARRAY_SIZE(values)) if (current_value >= ARRAY_SIZE(values))
{ {
RARCH_ERR("[CHEEVOS]: too many values in the leaderboard expression: %u\n", current_value); CHEEVOS_ERR("[CHEEVOS]: too many values in the leaderboard expression: %u\n", current_value);
return 0; return 0;
} }
@ -2128,11 +2126,11 @@ static void cheevos_lboard_submit(void *task_data, void *user_data,
if (!error) if (!error)
{ {
RARCH_ERR("[CHEEVOS]: error submitting leaderboard %u\n", lboard->id); CHEEVOS_ERR("[CHEEVOS]: error submitting leaderboard %u\n", lboard->id);
return; return;
} }
RARCH_LOG("[CHEEVOS]: submitted leaderboard %u.\n", lboard->id); CHEEVOS_LOG("[CHEEVOS]: submitted leaderboard %u.\n", lboard->id);
} }
static void cheevos_test_leaderboards(void) static void cheevos_test_leaderboards(void)
@ -2151,10 +2149,8 @@ static void cheevos_test_leaderboards(void)
if (value != lboard->last_value) if (value != lboard->last_value)
{ {
#ifdef CHEEVOS_VERBOSE CHEEVOS_LOG("[CHEEVOS]: value lboard %s %u\n",
RARCH_LOG("[CHEEVOS]: value lboard %s %u\n",
lboard->title, value); lboard->title, value);
#endif
lboard->last_value = value; lboard->last_value = value;
} }
@ -2165,7 +2161,7 @@ static void cheevos_test_leaderboards(void)
/* failsafe for improper LBs */ /* failsafe for improper LBs */
if (value == 0) if (value == 0)
{ {
RARCH_LOG("[CHEEVOS]: error: lboard %s tried to submit 0\n", CHEEVOS_LOG("[CHEEVOS]: error: lboard %s tried to submit 0\n",
lboard->title); lboard->title);
runloop_msg_queue_push("Leaderboard attempt cancelled!", runloop_msg_queue_push("Leaderboard attempt cancelled!",
0, 2 * 60, false); 0, 2 * 60, false);
@ -2179,7 +2175,7 @@ static void cheevos_test_leaderboards(void)
cheevos_make_lboard_url(lboard, url, sizeof(url)); cheevos_make_lboard_url(lboard, url, sizeof(url));
task_push_http_transfer(url, true, NULL, task_push_http_transfer(url, true, NULL,
cheevos_lboard_submit, lboard); cheevos_lboard_submit, lboard);
RARCH_LOG("[CHEEVOS]: submit lboard %s\n", lboard->title); CHEEVOS_LOG("[CHEEVOS]: submit lboard %s\n", lboard->title);
cheevos_format_value(value, lboard->format, cheevos_format_value(value, lboard->format,
formatted_value, sizeof(formatted_value)); formatted_value, sizeof(formatted_value));
@ -2192,7 +2188,7 @@ static void cheevos_test_leaderboards(void)
if (cheevos_test_lboard_condition(&lboard->cancel)) if (cheevos_test_lboard_condition(&lboard->cancel))
{ {
RARCH_LOG("[CHEEVOS]: cancel lboard %s\n", lboard->title); CHEEVOS_LOG("[CHEEVOS]: cancel lboard %s\n", lboard->title);
lboard->active = 0; lboard->active = 0;
runloop_msg_queue_push("Leaderboard attempt cancelled!", runloop_msg_queue_push("Leaderboard attempt cancelled!",
0, 2 * 60, false); 0, 2 * 60, false);
@ -2204,7 +2200,7 @@ static void cheevos_test_leaderboards(void)
{ {
char msg[256]; char msg[256];
RARCH_LOG("[CHEEVOS]: start lboard %s\n", lboard->title); CHEEVOS_LOG("[CHEEVOS]: start lboard %s\n", lboard->title);
lboard->active = 1; lboard->active = 1;
lboard->last_value = -1; lboard->last_value = -1;
@ -2317,10 +2313,10 @@ static int cheevos_deactivate__json_number(void *userdata,
} }
if (found) if (found)
RARCH_LOG("[CHEEVOS]: deactivated unlocked cheevo %u (%s).\n", CHEEVOS_LOG("[CHEEVOS]: deactivated unlocked cheevo %u (%s).\n",
cheevo->id, cheevo->title); cheevo->id, cheevo->title);
else else
RARCH_ERR("[CHEEVOS]: unknown cheevo to deactivate: %u.\n", id); CHEEVOS_ERR("[CHEEVOS]: unknown cheevo to deactivate: %u.\n", id);
} }
return 0; return 0;
@ -2516,9 +2512,7 @@ bool cheevos_unload(void)
if (running) if (running)
{ {
#ifdef CHEEVOS_VERBOSE CHEEVOS_LOG("[CHEEVOS]: Asked the load thread to terminate\n");
RARCH_LOG("[CHEEVOS]: Asked the load thread to terminate\n");
#endif
task_queue_cancel_task(cheevos_locals.task); task_queue_cancel_task(cheevos_locals.task);
#ifdef HAVE_THREADS #ifdef HAVE_THREADS
@ -2568,7 +2562,7 @@ bool cheevos_toggle_hardcore_mode(void)
if (settings->bools.rewind_enable) if (settings->bools.rewind_enable)
command_event(CMD_EVENT_REWIND_DEINIT, NULL); command_event(CMD_EVENT_REWIND_DEINIT, NULL);
RARCH_LOG("%s\n", msg); CHEEVOS_LOG("%s\n", msg);
runloop_msg_queue_push(msg, 0, 3 * 60, true); runloop_msg_queue_push(msg, 0, 3 * 60, true);
} }
else else
@ -2612,7 +2606,7 @@ static void cheevos_patch_addresses(cheevoset_t* set)
cheevos_var_patch_addr(&cond->source, cheevos_var_patch_addr(&cond->source,
cheevos_locals.console_id); cheevos_locals.console_id);
#ifdef CHEEVOS_DUMP_ADDRS #ifdef CHEEVOS_DUMP_ADDRS
RARCH_LOG("[CHEEVOS]: s-var %03d:%08X\n", CHEEVOS_LOG("[CHEEVOS]: s-var %03d:%08X\n",
cond->source.bank_id + 1, cond->source.value); cond->source.bank_id + 1, cond->source.value);
#endif #endif
break; break;
@ -2628,7 +2622,7 @@ static void cheevos_patch_addresses(cheevoset_t* set)
cheevos_var_patch_addr(&cond->target, cheevos_var_patch_addr(&cond->target,
cheevos_locals.console_id); cheevos_locals.console_id);
#ifdef CHEEVOS_DUMP_ADDRS #ifdef CHEEVOS_DUMP_ADDRS
RARCH_LOG("[CHEEVOS]: t-var %03d:%08X\n", CHEEVOS_LOG("[CHEEVOS]: t-var %03d:%08X\n",
cond->target.bank_id + 1, cond->target.value); cond->target.bank_id + 1, cond->target.value);
#endif #endif
break; break;
@ -2665,7 +2659,7 @@ static void cheevos_patch_lb_conditions(cheevos_condition_t* condition)
cheevos_var_patch_addr(&cond->source, cheevos_var_patch_addr(&cond->source,
cheevos_locals.console_id); cheevos_locals.console_id);
#ifdef CHEEVOS_DUMP_ADDRS #ifdef CHEEVOS_DUMP_ADDRS
RARCH_LOG("[CHEEVOS]: s-var %03d:%08X\n", CHEEVOS_LOG("[CHEEVOS]: s-var %03d:%08X\n",
cond->source.bank_id + 1, cond->source.value); cond->source.bank_id + 1, cond->source.value);
#endif #endif
break; break;
@ -2679,7 +2673,7 @@ static void cheevos_patch_lb_conditions(cheevos_condition_t* condition)
cheevos_var_patch_addr(&cond->target, cheevos_var_patch_addr(&cond->target,
cheevos_locals.console_id); cheevos_locals.console_id);
#ifdef CHEEVOS_DUMP_ADDRS #ifdef CHEEVOS_DUMP_ADDRS
RARCH_LOG("[CHEEVOS]: t-var %03d:%08X\n", CHEEVOS_LOG("[CHEEVOS]: t-var %03d:%08X\n",
cond->target.bank_id + 1, cond->target.value); cond->target.bank_id + 1, cond->target.value);
#endif #endif
break; break;
@ -2708,7 +2702,7 @@ static void cheevos_patch_lb_expressions(cheevos_expr_t* expression)
case CHEEVOS_VAR_TYPE_DELTA_MEM: case CHEEVOS_VAR_TYPE_DELTA_MEM:
cheevos_var_patch_addr(&term->var, cheevos_locals.console_id); cheevos_var_patch_addr(&term->var, cheevos_locals.console_id);
#ifdef CHEEVOS_DUMP_ADDRS #ifdef CHEEVOS_DUMP_ADDRS
RARCH_LOG("[CHEEVOS]: s-var %03d:%08X\n", CHEEVOS_LOG("[CHEEVOS]: s-var %03d:%08X\n",
term->var.bank_id + 1, term->var.value); term->var.bank_id + 1, term->var.value);
#endif #endif
break; break;
@ -2927,16 +2921,16 @@ static int cheevos_iterate(coro_t *coro)
cheevos_locals.meminfo[3].id = RETRO_MEMORY_RTC; cheevos_locals.meminfo[3].id = RETRO_MEMORY_RTC;
core_get_memory(&cheevos_locals.meminfo[3]); core_get_memory(&cheevos_locals.meminfo[3]);
RARCH_LOG("[CHEEVOS]: system RAM: %p %u\n", CHEEVOS_LOG("[CHEEVOS]: system RAM: %p %u\n",
cheevos_locals.meminfo[0].data, cheevos_locals.meminfo[0].data,
cheevos_locals.meminfo[0].size); cheevos_locals.meminfo[0].size);
RARCH_LOG("[CHEEVOS]: save RAM: %p %u\n", CHEEVOS_LOG("[CHEEVOS]: save RAM: %p %u\n",
cheevos_locals.meminfo[1].data, cheevos_locals.meminfo[1].data,
cheevos_locals.meminfo[1].size); cheevos_locals.meminfo[1].size);
RARCH_LOG("[CHEEVOS]: video RAM: %p %u\n", CHEEVOS_LOG("[CHEEVOS]: video RAM: %p %u\n",
cheevos_locals.meminfo[2].data, cheevos_locals.meminfo[2].data,
cheevos_locals.meminfo[2].size); cheevos_locals.meminfo[2].size);
RARCH_LOG("[CHEEVOS]: RTC: %p %u\n", CHEEVOS_LOG("[CHEEVOS]: RTC: %p %u\n",
cheevos_locals.meminfo[3].data, cheevos_locals.meminfo[3].data,
cheevos_locals.meminfo[3].size); cheevos_locals.meminfo[3].size);
@ -3034,7 +3028,7 @@ static int cheevos_iterate(coro_t *coro)
{ {
if (finders[coro->i].ext_hashes[coro->j] == hash) if (finders[coro->i].ext_hashes[coro->j] == hash)
{ {
RARCH_LOG("[CHEEVOS]: testing %s.\n", CHEEVOS_LOG("[CHEEVOS]: testing %s.\n",
finders[coro->i].name); finders[coro->i].name);
/* /*
@ -3059,7 +3053,7 @@ static int cheevos_iterate(coro_t *coro)
if (finders[coro->i].ext_hashes) if (finders[coro->i].ext_hashes)
continue; continue;
RARCH_LOG("[CHEEVOS]: testing %s.\n", CHEEVOS_LOG("[CHEEVOS]: testing %s.\n",
finders[coro->i].name); finders[coro->i].name);
/* /*
@ -3072,7 +3066,7 @@ static int cheevos_iterate(coro_t *coro)
goto found; goto found;
} }
RARCH_LOG("[CHEEVOS]: this game doesn't feature achievements.\n"); CHEEVOS_LOG("[CHEEVOS]: this game doesn't feature achievements.\n");
CORO_STOP(); CORO_STOP();
found: found:
@ -3098,7 +3092,7 @@ found:
if (!coro->json) if (!coro->json)
{ {
runloop_msg_queue_push("Error loading achievements.", 0, 5 * 60, false); runloop_msg_queue_push("Error loading achievements.", 0, 5 * 60, false);
RARCH_ERR("[CHEEVOS]: error loading achievements.\n"); CHEEVOS_ERR("[CHEEVOS]: error loading achievements.\n");
CORO_STOP(); CORO_STOP();
} }
#endif #endif
@ -3428,7 +3422,7 @@ found:
{ {
char gameid[16]; char gameid[16];
RARCH_LOG( CHEEVOS_LOG(
"[CHEEVOS]: getting game id for hash %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\n", "[CHEEVOS]: getting game id for hash %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\n",
coro->hash[ 0], coro->hash[ 1], coro->hash[ 2], coro->hash[ 3], coro->hash[ 0], coro->hash[ 1], coro->hash[ 2], coro->hash[ 3],
coro->hash[ 4], coro->hash[ 5], coro->hash[ 6], coro->hash[ 7], coro->hash[ 4], coro->hash[ 5], coro->hash[ 6], coro->hash[ 7],
@ -3461,13 +3455,13 @@ found:
{ {
if ((void*)coro->json) if ((void*)coro->json)
free((void*)coro->json); free((void*)coro->json);
RARCH_ERR("[CHEEVOS]: error getting game_id.\n"); CHEEVOS_ERR("[CHEEVOS]: error getting game_id.\n");
CORO_RET(); CORO_RET();
} }
if ((void*)coro->json) if ((void*)coro->json)
free((void*)coro->json); free((void*)coro->json);
RARCH_LOG("[CHEEVOS]: got game id %s.\n", gameid); CHEEVOS_LOG("[CHEEVOS]: got game id %s.\n", gameid);
coro->gameid = (unsigned)strtol(gameid, NULL, 10); coro->gameid = (unsigned)strtol(gameid, NULL, 10);
CORO_RET(); CORO_RET();
} }
@ -3497,11 +3491,11 @@ found:
if (!coro->json) if (!coro->json)
{ {
RARCH_ERR("[CHEEVOS]: error getting achievements for game id %u.\n", coro->gameid); CHEEVOS_ERR("[CHEEVOS]: error getting achievements for game id %u.\n", coro->gameid);
CORO_STOP(); CORO_STOP();
} }
RARCH_LOG("[CHEEVOS]: got achievements for game id %u.\n", coro->gameid); CHEEVOS_LOG("[CHEEVOS]: got achievements for game id %u.\n", coro->gameid);
CORO_RET(); CORO_RET();
/************************************************************************** /**************************************************************************
@ -3554,7 +3548,7 @@ found:
if (!badge_exists(coro->badge_fullpath)) if (!badge_exists(coro->badge_fullpath))
{ {
#ifdef CHEEVOS_LOG_BADGES #ifdef CHEEVOS_LOG_BADGES
RARCH_LOG( CHEEVOS_LOG(
"[CHEEVOS]: downloading badge %s\n", "[CHEEVOS]: downloading badge %s\n",
coro->badge_fullpath); coro->badge_fullpath);
#endif #endif
@ -3569,7 +3563,7 @@ found:
{ {
if (!filestream_write_file(coro->badge_fullpath, if (!filestream_write_file(coro->badge_fullpath,
coro->json, coro->k)) coro->json, coro->k))
RARCH_ERR("[CHEEVOS]: error writing badge %s\n", coro->badge_fullpath); CHEEVOS_ERR("[CHEEVOS]: error writing badge %s\n", coro->badge_fullpath);
else else
free(coro->json); free(coro->json);
} }
@ -3618,7 +3612,7 @@ found:
runloop_msg_queue_push( runloop_msg_queue_push(
"Please fill in your account information in Settings.", "Please fill in your account information in Settings.",
0, 5 * 60, false); 0, 5 * 60, false);
RARCH_ERR("[CHEEVOS]: login info not informed.\n"); CHEEVOS_ERR("[CHEEVOS]: login info not informed.\n");
CORO_STOP(); CORO_STOP();
} }
@ -3702,7 +3696,7 @@ found:
} }
runloop_msg_queue_push("RetroAchievements: Error contacting server.", 0, 5 * 60, false); runloop_msg_queue_push("RetroAchievements: Error contacting server.", 0, 5 * 60, false);
RARCH_ERR("[CHEEVOS]: error getting user token.\n"); CHEEVOS_ERR("[CHEEVOS]: error getting user token.\n");
CORO_STOP(); CORO_STOP();
@ -3734,7 +3728,7 @@ found:
for (coro->k = 0; coro->k < 5; coro->k++) for (coro->k = 0; coro->k < 5; coro->k++)
{ {
if (coro->k != 0) if (coro->k != 0)
RARCH_LOG("[CHEEVOS]: Retrying HTTP request: %u of 5\n", coro->k + 1); CHEEVOS_LOG("[CHEEVOS]: Retrying HTTP request: %u of 5\n", coro->k + 1);
coro->json = NULL; coro->json = NULL;
coro->conn = net_http_connection_new( coro->conn = net_http_connection_new(
@ -3796,7 +3790,7 @@ found:
net_http_connection_free(coro->conn); net_http_connection_free(coro->conn);
} }
RARCH_LOG("[CHEEVOS]: Couldn't connect to server after 5 tries\n"); CHEEVOS_LOG("[CHEEVOS]: Couldn't connect to server after 5 tries\n");
CORO_RET(); CORO_RET();
/************************************************************************** /**************************************************************************
@ -3828,15 +3822,15 @@ found:
if (coro->json) if (coro->json)
{ {
if (!cheevos_deactivate_unlocks(coro->json, CHEEVOS_ACTIVE_SOFTCORE)) if (!cheevos_deactivate_unlocks(coro->json, CHEEVOS_ACTIVE_SOFTCORE))
RARCH_LOG("[CHEEVOS]: deactivated unlocked achievements in softcore mode.\n"); CHEEVOS_LOG("[CHEEVOS]: deactivated unlocked achievements in softcore mode.\n");
else else
RARCH_ERR("[CHEEVOS]: error deactivating unlocked achievements in softcore mode.\n"); CHEEVOS_ERR("[CHEEVOS]: error deactivating unlocked achievements in softcore mode.\n");
if ((void*)coro->json) if ((void*)coro->json)
free((void*)coro->json); free((void*)coro->json);
} }
else else
RARCH_ERR("[CHEEVOS]: error retrieving list of unlocked achievements in softcore mode.\n"); CHEEVOS_ERR("[CHEEVOS]: error retrieving list of unlocked achievements in softcore mode.\n");
/* Deactivate achievements in hardcore mode. */ /* Deactivate achievements in hardcore mode. */
snprintf( snprintf(
@ -3857,15 +3851,15 @@ found:
if (coro->json) if (coro->json)
{ {
if (!cheevos_deactivate_unlocks(coro->json, CHEEVOS_ACTIVE_HARDCORE)) if (!cheevos_deactivate_unlocks(coro->json, CHEEVOS_ACTIVE_HARDCORE))
RARCH_LOG("[CHEEVOS]: deactivated unlocked achievements in hardcore mode.\n"); CHEEVOS_LOG("[CHEEVOS]: deactivated unlocked achievements in hardcore mode.\n");
else else
RARCH_ERR("[CHEEVOS]: error deactivating unlocked achievements in hardcore mode.\n"); CHEEVOS_ERR("[CHEEVOS]: error deactivating unlocked achievements in hardcore mode.\n");
if ((void*)coro->json) if ((void*)coro->json)
free((void*)coro->json); free((void*)coro->json);
} }
else else
RARCH_ERR("[CHEEVOS]: error retrieving list of unlocked achievements in hardcore mode.\n"); CHEEVOS_ERR("[CHEEVOS]: error retrieving list of unlocked achievements in hardcore mode.\n");
#endif #endif
CORO_RET(); CORO_RET();
@ -3894,14 +3888,14 @@ found:
if (coro->json) if (coro->json)
{ {
RARCH_LOG("[CHEEVOS]: posted playing activity.\n"); CHEEVOS_LOG("[CHEEVOS]: posted playing activity.\n");
if ((void*)coro->json) if ((void*)coro->json)
free((void*)coro->json); free((void*)coro->json);
} }
else else
RARCH_ERR("[CHEEVOS]: error posting playing activity.\n"); CHEEVOS_ERR("[CHEEVOS]: error posting playing activity.\n");
RARCH_LOG("[CHEEVOS]: posted playing activity.\n"); CHEEVOS_LOG("[CHEEVOS]: posted playing activity.\n");
CORO_RET(); CORO_RET();
CORO_LEAVE(); CORO_LEAVE();
@ -3922,16 +3916,14 @@ static void cheevos_task_handler(retro_task_t *task)
cheevos_locals.task = NULL; cheevos_locals.task = NULL;
CHEEVOS_UNLOCK(cheevos_locals.task_lock); CHEEVOS_UNLOCK(cheevos_locals.task_lock);
#ifdef CHEEVOS_VERBOSE
if (task_get_cancelled(task)) if (task_get_cancelled(task))
{ {
RARCH_LOG("[CHEEVOS]: Load task cancelled\n"); CHEEVOS_LOG("[CHEEVOS]: Load task cancelled\n");
} }
else else
{ {
RARCH_LOG("[CHEEVOS]: Load task finished\n"); CHEEVOS_LOG("[CHEEVOS]: Load task finished\n");
} }
#endif
if (coro->data) if (coro->data)
free(coro->data); free(coro->data);

17
cheevos/cheevos.h
View File

@ -38,6 +38,23 @@ End of setup
#define CHEEVOS_TAG "[CHEEVOS]: " #define CHEEVOS_TAG "[CHEEVOS]: "
#ifdef CHEEVOS_VERBOSE
#define CHEEVOS_LOG RARCH_LOG
#define CHEEVOS_ERR RARCH_ERR
#else
static void STUB_LOG(const char *fmt, ...)
{
(void)fmt;
}
#define CHEEVOS_LOG STUB_LOG
#define CHEEVOS_ERR STUB_LOG
#endif
typedef struct cheevos_ctx_desc typedef struct cheevos_ctx_desc
{ {
unsigned idx; unsigned idx;

2
cheevos/cond.c
View File

@ -65,7 +65,7 @@ static cheevos_cond_op_t cheevos_cond_parse_operator(const char** memaddr)
} }
else else
{ {
RARCH_ERR(CHEEVOS_TAG "unknown operator %c\n.", *str); CHEEVOS_ERR(CHEEVOS_TAG "unknown operator %c\n.", *str);
op = CHEEVOS_COND_OP_EQUALS; op = CHEEVOS_COND_OP_EQUALS;
} }

13
cheevos/var.c
View File

@ -24,17 +24,6 @@
#include "../core.h" #include "../core.h"
#include "../verbosity.h" #include "../verbosity.h"
static void STUB_LOG(const char *fmt, ...)
{
(void)fmt;
}
#ifdef CHEEVOS_VERBOSE
#define CHEEVOS_LOG RARCH_LOG
#else
#define CHEEVOS_LOG STUB_LOG
#endif
/***************************************************************************** /*****************************************************************************
Parsing Parsing
*****************************************************************************/ *****************************************************************************/
@ -327,7 +316,7 @@ uint8_t* cheevos_var_get_memory(const cheevos_var_t* var)
meminfo.id = RETRO_MEMORY_RTC; meminfo.id = RETRO_MEMORY_RTC;
break; break;
default: default:
RARCH_ERR(CHEEVOS_TAG "invalid bank id: %s\n", var->bank_id); CHEEVOS_ERR(CHEEVOS_TAG "invalid bank id: %s\n", var->bank_id);
break; break;
} }