Skip to content

Edits to TRACE_FETCH debug messages #4645

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
willcohen wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −15
Open

Edits to TRACE_FETCH debug messages #4645

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 17 additions & 15 deletions src/networkfilemanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2047,10 +2047,10 @@ static size_t pj_emscripten_read_range(PJ_CONTEXT *ctx,
emscripten_fetch_close(fetch);
}

TRACE_FETCH("Pre fecth. url: " << url << " range: " << szBuffer);
TRACE_FETCH("Pre-fetch, url: " << url << ", range: " << szBuffer);
fetch = emscripten_fetch(&attr, url.c_str());
// emscripten_fetch_wait(fetch, -1); // This is deprecated
TRACE_FETCH("Post fecth");
TRACE_FETCH("Post-fetch");

if (!fetch) {
snprintf(out_error_string, error_string_max_size,
Expand All @@ -2059,7 +2059,7 @@ static size_t pj_emscripten_read_range(PJ_CONTEXT *ctx,
return;
}
const auto response_code = fetch->status;
TRACE_FETCH("response code: " << response_code);
TRACE_FETCH("Received HTTP response code: " << response_code);
if (response_code == 0 || response_code >= 300) {
const double delay =
GetNewRetryDelay(static_cast<int>(response_code), oldDelay,
Expand All @@ -2068,8 +2068,9 @@ static size_t pj_emscripten_read_range(PJ_CONTEXT *ctx,
pj_log(ctx, PJ_LOG_TRACE,
"Got a HTTP %ld error. Retrying in %d ms",
response_code, static_cast<int>(delay));
TRACE_FETCH("Got a HTTP " << response_code
<< " retry in ms " << delay);
TRACE_FETCH("HTTP error " << response_code
<< ", retrying in " << delay
<< " ms");

sleep_ms(static_cast<int>(delay));
oldDelay = delay;
Expand All @@ -2084,7 +2085,7 @@ static size_t pj_emscripten_read_range(PJ_CONTEXT *ctx,
fetch->data);
}
}
TRACE_FETCH("HTTP error for " << url);
TRACE_FETCH("HTTP error for " << url);
emscripten_fetch_close(fetch);
return;
}
Expand All @@ -2099,8 +2100,8 @@ static size_t pj_emscripten_read_range(PJ_CONTEXT *ctx,

const size_t numBytes = static_cast<size_t>(fetch->numBytes);

TRACE_FETCH("read bytes: " << numBytes);
TRACE_FETCH("size to read: " << size_to_read);
TRACE_FETCH("Read bytes: " << numBytes);
TRACE_FETCH("Size to read: " << size_to_read);

if (fetch->readyState != 4) {
std::cout << "fetch ready state (" << fetch->readyState
Expand All @@ -2112,48 +2113,49 @@ static size_t pj_emscripten_read_range(PJ_CONTEXT *ctx,
if (numBytes) {
memcpy(buffer, fetch->data, real_read);
}
TRACE_FETCH("real read: " << real_read);
TRACE_FETCH("Real read: " << real_read);

// get the http headers
{
// https://github.com/emscripten-core/emscripten/blob/56c214a/test/fetch/test_fetch_headers_received.c
size_t headersLengthBytes =
emscripten_fetch_get_response_headers_length(fetch) + 1;
TRACE_FETCH("headers length: " << headersLengthBytes);
TRACE_FETCH("Headers length: " << headersLengthBytes);
char *headerString = (char *)malloc(headersLengthBytes);
assert(headerString);

emscripten_fetch_get_response_headers(fetch, headerString,
headersLengthBytes);
TRACE_FETCH("Got headers: " << headerString);
TRACE_FETCH("Raw headers:\n" << headerString);

char **responseHeaders =
emscripten_fetch_unpack_response_headers(headerString);
assert(responseHeaders);

free(headerString);

TRACE_FETCH("Parsed headers:");
int numHeaders = 0;
for (; responseHeaders[numHeaders * 2]; ++numHeaders) {
// Check both the header and its value are present.
assert(responseHeaders[(numHeaders * 2) + 1]);
std::string key(responseHeaders[numHeaders * 2]);
std::string val(responseHeaders[(numHeaders * 2) + 1]);
TRACE_FETCH(key << ":" << val);
TRACE_FETCH(" " << key << ": " << val);
std::transform(key.begin(), key.end(), key.begin(), ::tolower);
handle->m_headers.emplace(key, val);
}
TRACE_FETCH("Finished receiving " << numHeaders << " headers");
emscripten_fetch_free_unpacked_response_headers(responseHeaders);
}

TRACE_FETCH("pre-close");
TRACE_FETCH("Pre-close");
emscripten_fetch_close(fetch);
TRACE_FETCH("post-close");
TRACE_FETCH("Post-close");
return;
};
fetching();
TRACE_FETCH("post fetching");
TRACE_FETCH("Post-fetching");

if (real_read == 0) {
std::cout << "Problems in fetch:" << out_error_string << std::endl;
Expand Down
Loading