clearlinux/uwsgi
2
0
Fork 0
mirror of https://github.com/clearlinux/uwsgi.git synced 2026-08-25 15:36:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix mmap error check.

Browse Source 
Added logging of allocation error.
This commit is contained in:
Derrick Petzold
2014-12-05 15:21:21 -08:00
parent c0d61bc6a4
commit 9f084e151c
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/cache.c
+13 -5
View File
@@ -58,20 +58,28 @@ void uwsgi_init_cache() {
exit(1);
}
uwsgi.cache_items = (struct uwsgi_cache_item *) mmap(NULL, uwsgi.cache_filesize, PROT_READ | PROT_WRITE, MAP_SHARED, cache_fd, 0);
if (uwsgi.cache_items == MAP_FAILED) {
uwsgi_log("Unable to mmap %llu bytes.\n", uwsgi.cache_store);
uwsgi_error("mmap()");
exit(1);
}
uwsgi_cache_fix();
}
else {
uwsgi.cache_items = (struct uwsgi_cache_item *) mmap(NULL, (sizeof(struct uwsgi_cache_item) * uwsgi.cache_max_items) + (uwsgi.cache_blocksize * uwsgi.cache_max_items), PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0);
ssize_t cache_size = (sizeof(struct uwsgi_cache_item) * uwsgi.cache_max_items) + (uwsgi.cache_blocksize * uwsgi.cache_max_items);
uwsgi.cache_items = (struct uwsgi_cache_item *) mmap(NULL, cache_size, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0);
if (uwsgi.cache_items == MAP_FAILED) {
uwsgi_log("Unable to mmap %llu bytes.\n", cache_size);
uwsgi_error("mmap()");
exit(1);
}
int i;
for (i = 0; i < (int) uwsgi.cache_max_items; i++) {
memset(&uwsgi.cache_items[i], 0, sizeof(struct uwsgi_cache_item));
}
}
if (!uwsgi.cache_items) {
uwsgi_error("mmap()");
exit(1);
}
/*
uwsgi.cache = mmap(NULL, uwsgi.cache_blocksize * uwsgi.cache_max_items, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0);