From 00a3f6ae7f50d91bf11ce849058f50b0716a9dd2 Mon Sep 17 00:00:00 2001 From: "roberto@voldemort" Date: Mon, 28 Jun 2010 10:36:02 +0200 Subject: [PATCH] 64 bit fixes --- ChangeLog | 4 ++++ logging.c | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4bbcb21b..878fe50e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ *** june 2010 *** + * 0.9.5.3 [20100628] + +- fixed linux x86_64 compilation (sorry) + * 0.9.5.2 [20100626] * - fixed a request parsing bug diff --git a/logging.c b/logging.c index a145e133..54faa64c 100644 --- a/logging.c +++ b/logging.c @@ -68,11 +68,11 @@ void log_request(struct wsgi_request *wsgi_req) { if (uwsgi.shared->options[UWSGI_OPTION_MEMORY_DEBUG] == 1) { #ifndef UNBIT rlen = snprintf(mempkt, 4096, "{address space usage: %lld bytes/%lluMB} {rss usage: %llu bytes/%lluMB} ", - uwsgi.workers[uwsgi.mywid].vsz_size, uwsgi.workers[uwsgi.mywid].vsz_size / 1024 / 1024, - uwsgi.workers[uwsgi.mywid].rss_size, uwsgi.workers[uwsgi.mywid].rss_size / 1024 / 1024); + (unsigned long long) uwsgi.workers[uwsgi.mywid].vsz_size, (unsigned long long ) uwsgi.workers[uwsgi.mywid].vsz_size / 1024 / 1024, + (unsigned long long) uwsgi.workers[uwsgi.mywid].rss_size, (unsigned long long ) uwsgi.workers[uwsgi.mywid].rss_size / 1024 / 1024); #else rlen = snprintf(mempkt, 4096, "{address space usage: %lld bytes/%lluMB} ", - uwsgi.workers[uwsgi.mywid].vsz_size, uwsgi.workers[uwsgi.mywid].vsz_size / 1024 / 1024); + (unsigned long long) uwsgi.workers[uwsgi.mywid].vsz_size, (unsigned long long) uwsgi.workers[uwsgi.mywid].vsz_size / 1024 / 1024); #endif @@ -87,7 +87,7 @@ void log_request(struct wsgi_request *wsgi_req) { uwsgi.mypid, wsgi_req->app_id, app_req, - uwsgi.workers[0].requests, + (unsigned long long ) uwsgi.workers[0].requests, wsgi_req->remote_addr_len, wsgi_req->remote_addr, wsgi_req->remote_user_len, wsgi_req->remote_user, wsgi_req->var_cnt, @@ -95,7 +95,7 @@ void log_request(struct wsgi_request *wsgi_req) { 24, time_request, wsgi_req->method_len, wsgi_req->method, wsgi_req->uri_len, wsgi_req->uri, - (uint64_t) wsgi_req->response_size, + (unsigned long long) wsgi_req->response_size, (long int) (microseconds - microseconds2) / 1000, via, wsgi_req->protocol_len, wsgi_req->protocol,