Skip to content

Commit 7a2a5cb

Browse files
committed
UPD | 1.0.3 release
1 parent 4d6c5d6 commit 7a2a5cb

File tree

5 files changed

+17
-11
lines changed

5 files changed

+17
-11
lines changed

src/ManapiEventLoop.cpp

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1191,7 +1191,7 @@ manapi::sys_error::status_or<std::shared_ptr<manapi::ev::io>> manapi::event_loop
11911191
return data->create_watcher_socket(fd, [data, fd] (const std::shared_ptr<ev::io> &w, int status, int revents)
11921192
-> void {
11931193
auto data2 = data;
1194-
//MANAPIHTTP_LOG("CURL EV: {} {}", revents, (int)fd);
1194+
//MANAPIHTTP_LOG("CURL EV: {} {}", revents, static_cast<int>(fd));
11951195
int cnt; auto rhs = curl_multi_socket_action(data->curl_watcher->curl_multi.get(), fd, (revents & 0b11), &cnt);
11961196
if (rhs != CURLM_OK) {
11971197
data->logger_->debug(manapi::logger::default_service, "curl_multi_socket_action(...) returned an invalid response: {}", static_cast<int>(rhs));
@@ -1337,7 +1337,8 @@ manapi::error::status manapi::event_loop::watch_curl(void * shared_curl, std::mo
13371337

13381338
if (mcode != CURLM_OK) {
13391339
this->curl_watcher->curl_res.erase(curl.get());
1340-
manapi_log_trace(manapi::debug::LOG_TRACE_MEDIUM, "curl_multi_add_handle() using %p returned %zu", curl.get(), mcode);
1340+
manapi_log_trace(manapi::debug::LOG_TRACE_MEDIUM, "curl_multi_add_handle() using %p returned %d",
1341+
curl.get(), static_cast<int>(mcode));
13411342
return error::status_invalid_argument("curl_multi_add_handle failed");
13421343
}
13431344
}
@@ -1368,7 +1369,8 @@ manapi::error::status manapi::event_loop::unwatch_curl(void * shared_curl) MANAP
13681369
CURLMcode const mcode = curl_multi_remove_handle(this->curl_watcher->curl_multi.get(), curl.get());
13691370

13701371
if (mcode != CURLM_OK) {
1371-
manapi_log_trace(manapi::debug::LOG_TRACE_MEDIUM, "curl_multi_remove_handle() using %p returned %zu", curl.get(), mcode);
1372+
manapi_log_trace(manapi::debug::LOG_TRACE_MEDIUM, "curl_multi_remove_handle() using %p returned %d", curl.get(),
1373+
static_cast<int>(mcode));
13721374
return error::status_invalid_argument("curl_multi_remove_handle failed");
13731375
}
13741376

@@ -1399,7 +1401,8 @@ manapi::error::status manapi::event_loop::pause_watch_curl(void * shared_curl) M
13991401
/* pause */
14001402
const auto rhs = curl_easy_pause(curl.get(), CURLPAUSE_ALL);
14011403
if (CURLE_OK != rhs) {
1402-
manapi_log_trace(manapi::debug::LOG_TRACE_MEDIUM, "curl_easy_pause() using %p returned %zu", curl.get(), rhs);
1404+
manapi_log_trace(manapi::debug::LOG_TRACE_MEDIUM, "curl_easy_pause() using %p returned %d",
1405+
curl.get(), static_cast<int>(rhs));
14031406
return error::status_invalid_argument("curl_easy_pause failed");
14041407
}
14051408
MANAPIHTTP_MUST_ALLOC_START
@@ -1417,7 +1420,8 @@ manapi::error::status manapi::event_loop::unpause_watch_curl(void *shared_curl)
14171420
const auto rhs = curl_easy_pause(curl.get(), CURLPAUSE_CONT);
14181421

14191422
if (CURLE_OK != rhs) {
1420-
manapi_log_trace(manapi::debug::LOG_TRACE_MEDIUM, "curl_easy_pause() using %p returned %zu", curl.get(), rhs);
1423+
manapi_log_trace(manapi::debug::LOG_TRACE_MEDIUM, "curl_easy_pause() using %p returned %d", curl.get(),
1424+
static_cast<int>(rhs));
14211425
return error::status_invalid_argument("curl_easy_pause failed");
14221426
}
14231427

src/ManapiMemoryPool.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ struct object_pool_deleter {
117117
while (!buffs.empty()) {
118118
auto pn = std::move(buffs.back());
119119
buffs.pop_back();
120-
manapi_log_trace(manapi::debug::LOG_TRACE_LOW, "memory fabric:%p (%zu) was freed",
120+
manapi_log_trace(manapi::debug::LOG_TRACE_LOW, "memory fabric:%p (%d) was freed",
121121
pn.first, pn.second);
122122
delete[] static_cast<char *>(pn.first);
123123
}

src/ManapiUtils.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ void manapi::print_stacktrace() MANAPIHTTP_NOEXCEPT {
3232
auto stack = std::stacktrace::current();
3333
for (std::size_t i = 0; i < stack.size(); i++) {
3434
auto &it = stack[i];
35-
manapi_log_info("#%zu %p in %.*s at %.*s:%zu", i, it.native_handle(),
35+
manapi_log_info("#%zu %p in %.*s at %.*s:%u", i, it.native_handle(),
3636
it.description().size(), it.description().data(),
3737
it.source_file().size(), it.source_file().data(),
3838
it.source_line());
@@ -51,14 +51,14 @@ void manapi::print_stacktrace(std::size_t pos) MANAPIHTTP_NOEXCEPT {
5151
#if MANAPIHTTP_CPPTRACE_DEPENDENCY
5252
auto stack = cpptrace::stacktrace::current(pos);
5353
auto it = stack.begin();
54-
manapi_log_info("%p in %.*s at %.*s:%zu", it->raw_address,
54+
manapi_log_info("%p in %.*s at %.*s:%u", it->raw_address,
5555
it->symbol.size(), it->symbol.data(),
5656
it->filename.size(), it->filename.data(),
5757
it->line.value_or(0));
5858
#elif __cplusplus >= 202302L && MANAPIHTTP_STD_BACKTRACE_DEPENDENCY
5959
auto stack = std::stacktrace::current();
6060
auto &it = stack[pos];
61-
manapi_log_info("%p in %.*s at %.*s:%zu", it.native_handle(),
61+
manapi_log_info("%p in %.*s at %.*s:%u", it.native_handle(),
6262
it.description().size(), it.description().data(),
6363
it.source_file().size(), it.source_file().data(),
6464
it.source_line());

src/http/ManapiNgHttp3Interface.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1026,7 +1026,9 @@ static int ng_wrk_http3_init (const manapi::net::worker::shared_conn &conn, mana
10261026

10271027
manapi_log_trace(manapi::debug::LOG_TRACE_LOW, "nghttp3: %s settings on %p: "
10281028
"enable_connect_procotol=%d, h3_datagram=%d max_field_section_size=%zu qpack_blocked_streams=%zu "
1029-
"qpack_encoder_max_dtable_capacity=%zu qpack_max_dtable_capacity=%zu", "send", p, tp->h3_settings.enable_connect_protocol, tp->h3_settings.h3_datagram,
1029+
"qpack_encoder_max_dtable_capacity=%zu qpack_max_dtable_capacity=%zu", "send", p,
1030+
static_cast<int>(tp->h3_settings.enable_connect_protocol),
1031+
static_cast<int>(tp->h3_settings.h3_datagram),
10301032
tp->h3_settings.max_field_section_size, tp->h3_settings.qpack_blocked_streams, tp->h3_settings.qpack_encoder_max_dtable_capacity,
10311033
tp->h3_settings.qpack_max_dtable_capacity);
10321034

src/worker/ManapiTlsOverTcp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -816,7 +816,7 @@ int manapi::net::worker::TLS::ssl_bio_flush_write_(const shared_conn &conn, tls_
816816
if (rhs > 0) {
817817
ssize_t alr = 0;
818818
if (!m->top->send_size && (rhs > 32 || (m->flags & CONN_TLS_SHUTDOWN))) {
819-
manapi_log_trace_hard("TLS:write %p flags=%d size=%zu", m, m->flags, rhs);
819+
manapi_log_trace_hard("TLS:write %p flags=%d size=%d", m, m->flags, rhs);
820820
alr = m->watcher->try_write(fastfast, rhs);
821821
if (alr < 0) {
822822
if (alr == ev::ERR_AGAIN)

0 commit comments

Comments
 (0)