r2258 - in branches/1.2: . bin/varnishd
des at projects.linpro.no
des at projects.linpro.no
Thu Nov 15 17:04:25 CET 2007
Author: des
Date: 2007-11-15 17:04:24 +0100 (Thu, 15 Nov 2007)
New Revision: 2258
Modified:
branches/1.2/
branches/1.2/bin/varnishd/mgt_param.c
branches/1.2/bin/varnishd/mgt_vcc.c
Log:
Merged revisions 2249 via svnmerge from
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache
........
r2249 | des | 2007-11-09 15:10:15 +0100 (Fri, 09 Nov 2007) | 10 lines
Significant rewrite of the code used to invoke the C compiler. The most
important functional change is that the source is no longer piped to the
compiler; instead, the source file name (which now ends in .c) is passed
on the command line. This makes it *much* easier to support non-GNU
compilers.
The cc_command parameter processed by a custom function instead of sprintf;
"%s" is replaced with the source file name, "%o" is replaced with the output
file name, and "%%" is replaced with a single "%".
........
Property changes on: branches/1.2
___________________________________________________________________
Name: svnmerge-integrated
- /trunk/varnish-cache:1-2101,2104-2107,2115-2120,2122-2130,2133,2151,2153-2154,2157,2161-2162,2166-2168,2173,2175-2176,2180-2184,2186-2193,2206,2208,2210-2215,2220,2222-2232,2243,2246,2248,2251
+ /trunk/varnish-cache:1-2101,2104-2107,2115-2120,2122-2130,2133,2151,2153-2154,2157,2161-2162,2166-2168,2173,2175-2176,2180-2184,2186-2193,2206,2208,2210-2215,2220,2222-2232,2243,2246,2248-2249,2251
Modified: branches/1.2/bin/varnishd/mgt_param.c
===================================================================
--- branches/1.2/bin/varnishd/mgt_param.c 2007-11-15 16:03:57 UTC (rev 2257)
+++ branches/1.2/bin/varnishd/mgt_param.c 2007-11-15 16:04:24 UTC (rev 2258)
@@ -541,14 +541,6 @@
if (arg == NULL) {
cli_out(cli, "%s", mgt_cc_cmd);
} else {
-#if defined(HAVE_FMTCHECK)
- if (arg != fmtcheck(arg, "%s %s")) {
- cli_out(cli,
- "Parameter has dangerous %%-string expansions.");
- cli_result(cli, CLIS_PARAM);
- return;
- }
-#endif
free(mgt_cc_cmd);
mgt_cc_cmd = strdup(arg);
XXXAN(mgt_cc_cmd);
@@ -756,16 +748,14 @@
"2", "seconds" },
{ "cc_command", tweak_cc_command,
"Command used for compiling the C source code to a "
- "dlopen(3) loadable object.\n"
- "NB: The string must contain two %s sequences which "
- "will be replaced by the binary and source file names "
- "respectively.\n"
+ "dlopen(3) loadable object. Any occurrence of %s in "
+ "the string will be replaced with the source file name, "
+ "and %o will be replaced with the output file name.\n"
MUST_RELOAD,
#ifdef __APPLE__
- "exec cc -dynamiclib -Wl,-undefined,dynamic_lookup -o %s -x c"
- " - < %s"
+ "exec cc -dynamiclib -Wl,-undefined,dynamic_lookup -o %o %s"
#else
- "exec cc -nostdinc -fpic -shared -Wl,-x -o %s -x c - < %s"
+ "exec cc -fpic -shared -Wl,-x -o %o %s"
#endif
, NULL },
{ "max_restarts", tweak_max_restarts,
Modified: branches/1.2/bin/varnishd/mgt_vcc.c
===================================================================
--- branches/1.2/bin/varnishd/mgt_vcc.c 2007-11-15 16:03:57 UTC (rev 2257)
+++ branches/1.2/bin/varnishd/mgt_vcc.c 2007-11-15 16:04:24 UTC (rev 2258)
@@ -32,13 +32,14 @@
*/
#include <sys/types.h>
+#include <sys/wait.h>
#include <dlfcn.h>
+#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <sys/wait.h>
#ifndef HAVE_ASPRINTF
#include "compat/asprintf.h"
@@ -119,7 +120,7 @@
"\n"
"sub vcl_fetch {\n"
" if (!obj.valid) {\n"
- " error;\n"
+ " error obj.status;\n"
" }\n"
" if (!obj.cacheable) {\n"
" pass;\n"
@@ -139,147 +140,154 @@
" discard;\n"
"}\n";
+/*
+ * Prepare the compiler command line
+ */
+static void
+mgt_make_cc_cmd(struct vsb *sb, const char *sf, const char *of)
+{
+ int pct;
+ char *p;
+
+ for (p = mgt_cc_cmd, pct = 0; *p; ++p) {
+ if (pct) {
+ switch (*p) {
+ case 's':
+ vsb_cat(sb, sf);
+ break;
+ case 'o':
+ vsb_cat(sb, of);
+ break;
+ case '%':
+ vsb_putc(sb, '%');
+ break;
+ default:
+ vsb_putc(sb, '%');
+ vsb_putc(sb, *p);
+ break;
+ }
+ pct = 0;
+ } else if (*p == '%') {
+ pct = 1;
+ } else {
+ vsb_putc(sb, *p);
+ }
+ }
+ if (pct)
+ vsb_putc(sb, '%');
+}
+
/*--------------------------------------------------------------------
* Invoke system C compiler on source and return resulting dlfile.
* Errors goes in sb;
*/
static char *
-mgt_CallCc(const char *source, struct vsb *sb)
+mgt_run_cc(const char *source, struct vsb *sb)
{
- FILE *fo, *fs;
- char sf[] = "./vcl.XXXXXXXX";
+ char cmdline[1024];
+ struct vsb cmdsb;
+ char sf[] = "./vcl.########.c";
char *of;
- struct vsb *cccmd;
char buf[128];
- int i, j, sfd;
- void *p;
+ int p[2], sfd, srclen, status;
+ pid_t pid;
+ void *dlh;
/* Create temporary C source file */
- sfd = mkstemp(sf);
+ sfd = vtmpfile(sf);
if (sfd < 0) {
vsb_printf(sb,
- "Cannot open temporary source file \"%s\": %s\n",
- sf, strerror(errno));
+ "%s(): failed to create %s: %s",
+ __func__, sf, strerror(errno));
return (NULL);
}
- fs = fdopen(sfd, "r+");
- XXXAN(fs);
-
- if (fputs(source, fs) < 0 || fflush(fs)) {
+ srclen = strlen(source);
+ if (write(sfd, source, srclen) != srclen) {
vsb_printf(sb,
- "Write error to C source file: %s\n",
+ "Failed to write C source to file: %s",
strerror(errno));
AZ(unlink(sf));
- AZ(fclose(fs));
+ AZ(close(sfd));
return (NULL);
}
- rewind(fs);
+ AZ(close(sfd));
- /* Name the output shared library by brutally overwriting "./vcl." */
+ /* Name the output shared library by overwriting the final 'c' */
of = strdup(sf);
XXXAN(of);
- memcpy(of, "./bin", 5);
+ of[sizeof sf - 2] = 'o';
+ vsb_new(&cmdsb, cmdline, sizeof cmdline, 0);
+ mgt_make_cc_cmd(&cmdsb, sf, of);
+ vsb_finish(&cmdsb);
+ /* XXX check vsb state */
- cccmd = vsb_new(NULL, NULL, 0, VSB_AUTOEXTEND);
- XXXAN(cccmd);
-
- /*
- * Attempt to open a pipe to the system C-compiler.
- * ------------------------------------------------
- *
- * The arguments to the C-compiler must be whatever it takes to
- * create a dlopen(3) compatible object file named $of from a
- * source file named $sf.
- *
- * The source code is entirely selfcontained, so options should be
- * specified to prevent the C-compiler from doing any DWITYW
- * processing. For GCC this amounts to at least "-nostdinc".
- *
- * We wrap the entire command in a 'sh -c "..." 2>&1' to get any
- * errors from popen(3)'s shell redirected to our stderr as well.
- *
- */
- vsb_printf(cccmd, "exec /bin/sh -c \"" );
- vsb_printf(cccmd, mgt_cc_cmd, of, sf);
- vsb_printf(cccmd, "\" 2>&1");
- vsb_finish(cccmd);
- /* XXX: check that vsb is happy about cccmd */
-
- fo = popen(vsb_data(cccmd), "r");
- if (fo == NULL) {
- vsb_printf(sb,
- "System error: Cannot execute C-compiler: %s\n"
- "\tcommand attempted: %s\n",
- strerror(errno), vsb_data(cccmd));
+ if (pipe(p) < 0) {
+ vsb_printf(sb, "%s(): pipe() failed: %s",
+ __func__, strerror(errno));
+ unlink(sf);
free(of);
- AZ(unlink(sf));
- AZ(fclose(fs));
- vsb_delete(cccmd);
return (NULL);
}
-
- /* Any output is considered fatal */
- j = 0;
- while (1) {
- i = fread(buf, 1, sizeof buf, fo);
- if (i == 0)
- break;
- if (!j) {
- vsb_printf(sb,
- "System error:\n"
- "C-compiler command complained.\n"
- "Command attempted: %s\nMessage:\n",
- vsb_data(cccmd));
- j++;
- }
- vsb_bcat(sb, buf, i);
+ if ((pid = fork()) < 0) {
+ vsb_printf(sb, "%s(): fork() failed: %s",
+ __func__, strerror(errno));
+ close(p[0]);
+ close(p[1]);
+ unlink(sf);
+ free(of);
+ return (NULL);
}
-
- i = pclose(fo);
-
- AZ(unlink(sf));
- AZ(fclose(fs));
-
- if (j == 0 && i != 0) {
- vsb_printf(sb,
- "System error:\n"
- "C-compiler command failed");
- if (WIFEXITED(i))
- vsb_printf(sb, ", exit %d", WEXITSTATUS(i));
- if (WIFSIGNALED(i))
- vsb_printf(sb, ", signal %d", WTERMSIG(i));
- if (WCOREDUMP(i))
- vsb_printf(sb, ", core dumped");
- vsb_printf(sb,
- "\nCommand attempted: %s\n", vsb_data(cccmd));
+ if (pid == 0) {
+ close(p[0]);
+ close(STDIN_FILENO);
+ assert(open("/dev/null", O_RDONLY) == STDIN_FILENO);
+ assert(dup2(p[1], STDOUT_FILENO) == STDOUT_FILENO);
+ assert(dup2(p[1], STDERR_FILENO) == STDERR_FILENO);
+ execl("/bin/sh", "/bin/sh", "-c", cmdline, NULL);
+ _exit(1);
}
-
- vsb_delete(cccmd);
-
- /* If the compiler complained, or exited non-zero, fail */
- if (i || j) {
- (void)unlink(of); /* May or may not have created file */
+ close(p[1]);
+ while (read(p[0], buf, sizeof buf) > 0)
+ /* XXX nothing */ ;
+ close(p[0]);
+ unlink(sf);
+ if (waitpid(pid, &status, 0) < 0) {
+ vsb_printf(sb, "%s(): waitpid() failed: %s",
+ __func__, strerror(errno));
+ unlink(of);
free(of);
return (NULL);
}
+ if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
+ vsb_printf(sb, "%s(): Compiler failed", __func__);
+ if (WIFEXITED(status))
+ vsb_printf(sb, ", exit %d", WEXITSTATUS(status));
+ if (WIFSIGNALED(status))
+ vsb_printf(sb, ", signal %d", WTERMSIG(status));
+ if (WCOREDUMP(status))
+ vsb_printf(sb, ", core dumped");
+ unlink(of);
+ free(of);
+ return (NULL);
+ }
/* Next, try to load the object into the management process */
- p = dlopen(of, RTLD_NOW | RTLD_LOCAL);
- if (p == NULL) {
- vsb_printf(sb, "Problem loading compiled VCL program:\n\t%s\n",
- dlerror());
- AZ(unlink(of));
+ if ((dlh = dlopen(of, RTLD_NOW | RTLD_LOCAL)) == NULL) {
+ vsb_printf(sb,
+ "%s(): failed to load compiled VCL program: %s",
+ __func__, dlerror());
+ unlink(of);
free(of);
return (NULL);
- }
+ }
/*
* XXX: we should look up and check the handle in the loaded
* object
*/
- AZ(dlclose(p));
+ AZ(dlclose(dlh));
return (of);
}
@@ -294,7 +302,7 @@
if (csrc != NULL) {
if (C_flag)
(void)fputs(csrc, stdout);
- vf = mgt_CallCc(csrc, sb);
+ vf = mgt_run_cc(csrc, sb);
if (C_flag && vf != NULL)
AZ(unlink(vf));
free(csrc);
@@ -311,7 +319,7 @@
if (csrc != NULL) {
if (C_flag)
fputs(csrc, stdout);
- vf = mgt_CallCc(csrc, sb);
+ vf = mgt_run_cc(csrc, sb);
if (C_flag && vf != NULL)
AZ(unlink(vf));
free(csrc);
More information about the varnish-commit
mailing list