Return-Path: Delivered-To: new-httpd-archive@hyperreal.org Received: (qmail 24261 invoked by uid 6000); 3 Feb 1998 07:42:59 -0000 Received: (qmail 24255 invoked from network); 3 Feb 1998 07:42:58 -0000 Received: from twinlark.arctic.org (204.62.130.91) by taz.hyperreal.org with SMTP; 3 Feb 1998 07:42:58 -0000 Received: (qmail 29715 invoked by uid 500); 3 Feb 1998 07:54:52 -0000 Date: Mon, 2 Feb 1998 23:54:51 -0800 (PST) From: Dean Gaudet To: new-httpd@apache.org Subject: [contrib] mod_mmap_static v0.02 Message-ID: X-Comment: Visit http://www.arctic.org/~dgaudet/legal for information regarding copyright and disclaimer. Organization: Transmeta Corp. MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: new-httpd-owner@apache.org Precedence: bulk Reply-To: new-httpd@apache.org This one fixes a few silly mistakes in the first one. Also if you refresh cvs this one completely avoids the stat() on the files being served. It's almost clean too, except for DocumentRoot. This is the same problem that Ralf has in mod_rewrite. In most cases this module is completely transparent to the rest of the server -- it really thinks it has looked at the disk regarding the file. The annoying exception is sub_req_lookup_file(), the short-cut case. Dean /* * mod_mmap_static: mmap a config-time list of files for faster serving * * v0.02 * * Author: Dean Gaudet * * This code would be available under the same license as the Apache server * itself, but unfortunately that license doesn't really allow for third * parties to distribute code under it. So since I'm just too plain * lazy to copy another license in here, I'll just have to do this: * * Copyright (c) 1998 Dean Gaudet, all rights reserved. */ /* Documentation: The concept is simple. Some sites have a set of static files that are really busy, and change infrequently (or even on a regular schedule). Save time by mmap()ing these files into memory and avoid a lot of the crap required to do normal file serving. Place directives such as: mmapfile /path/to/file1 mmapfile /path/to/file2 ... into your configuration. These files are only mmap()d when the server is restarted, so if you change the list, or if the files are changed, then you'll need to restart the server. There's no such thing as inheriting these files across vhosts or whatever... place the directives in the main server only. To reiterate that point: if the files are modified *in place* without restarting the server you may end up serving requests that are completely bogus. You should update files by unlinking the old copy and putting a new copy in place. Most tools such as rdist and mv do this. */ #include #include #include #include #include #include #include #include #include "httpd.h" #include "http_config.h" #include "http_log.h" #include "http_protocol.h" #include "http_request.h" module MODULE_VAR_EXPORT mmap_static_module; typedef struct { char *filename; void *mm; struct stat finfo; } a_file; typedef struct { array_header *files; } a_server_config; static void *create_server_config(pool *p, server_rec *s) { a_server_config *sconf = palloc(p, sizeof(*sconf)); sconf->files = make_array(p, 20, sizeof(a_file)); return sconf; } static void cleanup_mmap(void *sconfv) { a_server_config *sconf = sconfv; size_t n; a_file *file; n = sconf->files->nelts; file = (a_file *)sconf->files->elts; while(n) { munmap(file->mm, file->finfo.st_size); ++file; --n; } } static const char *mmapfile(cmd_parms *cmd, void *dummy, char *filename) { a_server_config *sconf; a_file *new_file; a_file tmp; int fd; caddr_t mm; if (stat(filename, &tmp.finfo) == -1) { aplog_error(APLOG_MARK, APLOG_WARNING, cmd->server, "mmap_static: unable to stat(%s), skipping", filename); return NULL; } if ((tmp.finfo.st_mode & S_IFMT) != S_IFREG) { aplog_error(APLOG_MARK, APLOG_WARNING, cmd->server, "mmap_static: %s isn't a regular file, skipping", filename); return NULL; } block_alarms(); fd = open(filename, O_RDONLY, 0); if (fd == -1) { aplog_error(APLOG_MARK, APLOG_WARNING, cmd->server, "mmap_static: unable to open(%s, O_RDONLY), skipping", filename); return NULL; } mm = mmap(NULL, tmp.finfo.st_size, PROT_READ, MAP_SHARED, fd, 0); if (mm == (caddr_t)-1) { int save_errno = errno; close(fd); unblock_alarms(); errno = save_errno; aplog_error(APLOG_MARK, APLOG_WARNING, cmd->server, "mmap_static: unable to mmap %s, skipping", filename); return NULL; } close(fd); tmp.mm = mm; tmp.filename = pstrdup(cmd->pool, filename); sconf = get_module_config(cmd->server->module_config, &mmap_static_module); new_file = push_array(sconf->files); *new_file = tmp; if (sconf->files->nelts == 1) { /* first one, register the cleanup */ register_cleanup(cmd->pool, sconf, cleanup_mmap, null_cleanup); } unblock_alarms(); return NULL; } static command_rec mmap_static_cmds[] = { { "mmapfile", mmapfile, NULL, RSRC_CONF, ITERATE, "A space separated list of files to mmap at config time" }, { NULL } }; static int file_compare(const void *av, const void *bv) { const a_file *a = av; const a_file *b = bv; return strcmp(a->filename, b->filename); } static void mmap_init(server_rec *s, pool *p) { a_server_config *sconf; /* sort the elements of the main_server */ sconf = get_module_config(s->module_config, &mmap_static_module); qsort(sconf->files->elts, sconf->files->nelts, sizeof(a_file), file_compare); /* and make the virtualhosts share the same thing */ for (s = s->next; s; s = s->next) { set_module_config(s->module_config, &mmap_static_module, sconf); } } /* a magic token which says we've already looked for a match * and found there was none */ #define NO_MATCH ((void *)&mmap_static_module) /* If it's one of ours, fill in r->finfo now to avoid extra stat()... this is a * bit of a kludge, because we really want to run after core_translate runs. */ extern int core_translate(request_rec *r); static int mmap_static_xlat(request_rec *r) { a_server_config *sconf; a_file tmp; a_file *match; int res; /* we require other modules to first set up a filename */ if (!r->filename) { res = core_translate(r); if (res == DECLINED || !r->filename) { return res; } } sconf = get_module_config(r->server->module_config, &mmap_static_module); tmp.filename = r->filename; match = bsearch(&tmp, sconf->files->elts, sconf->files->nelts, sizeof(a_file), file_compare); if (match == NULL) { set_module_config(r->request_config, &mmap_static_module, NO_MATCH); return DECLINED; } /* shortcircuit the get_path_info() stat() calls and stuff */ r->finfo = match->finfo; set_module_config(r->request_config, &mmap_static_module, match); return OK; } static int mmap_static_handler(request_rec *r) { a_server_config *sconf; a_file tmp; a_file *match; int rangestatus, errstatus; /* we don't handle anything but GET */ if (r->method_number != M_GET) return DECLINED; /* find out if we're serving this file */ match = get_module_config(r->request_config, &mmap_static_module); if (match == NO_MATCH) { return DECLINED; } if (match == NULL) { sconf = get_module_config(r->server->module_config, &mmap_static_module); tmp.filename = r->filename; match = bsearch(&tmp, sconf->files->elts, sconf->files->nelts, sizeof(a_file), file_compare); if (match == NULL) { return DECLINED; } } /* note that we would handle GET on this resource */ r->allowed |= (1 << M_GET); /* This handler has no use for a request body (yet), but we still * need to read and discard it if the client sent one. */ if ((errstatus = discard_request_body(r)) != OK) return errstatus; update_mtime(r, match->finfo.st_mtime); set_last_modified(r); set_etag(r); if (((errstatus = meets_conditions(r)) != OK) || (errstatus = set_content_length (r, match->finfo.st_size))) { return errstatus; } rangestatus = set_byterange(r); send_http_header(r); if (!r->header_only) { if (!rangestatus) { send_mmap (match->mm, r, 0, match->finfo.st_size); } else { long offset, length; while (each_byterange(r, &offset, &length)) { send_mmap(match->mm, r, offset, length); } } } return OK; } static handler_rec mmap_static_handlers[] = { { "*/*", mmap_static_handler }, { NULL } }; module MODULE_VAR_EXPORT mmap_static_module = { STANDARD_MODULE_STUFF, mmap_init, /* initializer */ NULL, /* dir config creater */ NULL, /* dir merger --- default is to override */ create_server_config, /* server config */ NULL, /* merge server config */ mmap_static_cmds, /* command handlers */ mmap_static_handlers, /* handlers */ mmap_static_xlat, /* filename translation */ NULL, /* check_user_id */ NULL, /* check auth */ NULL, /* check access */ NULL, /* type_checker */ NULL, /* fixups */ NULL, /* logger */ NULL, /* header parser */ NULL, /* child_init */ NULL, /* child_exit */ NULL /* post read-request */ };