From: Eric Wong <e@80x24.org>
To: mwrap-perl@80x24.org
Subject: [PATCH 05/19] mwrap_httpd: flesh out /$PID/ and /$PID/trim endpoints
Date: Thu, 15 Dec 2022 20:52:41 +0000 [thread overview]
Message-ID: <20221215205255.27840-6-e@80x24.org> (raw)
In-Reply-To: <20221215205255.27840-1-e@80x24.org>
I won't be developing Devel::Mwrap::PSGI further since
mwrap_httpd is less intrusive and faster.
---
lib/Devel/Mwrap/PSGI.pm | 2 ++
mwrap_httpd.h | 31 +++++++++++++++++++++++++++++++
t/mwrap-httpd.t | 11 +++++++++++
3 files changed, 44 insertions(+)
diff --git a/lib/Devel/Mwrap/PSGI.pm b/lib/Devel/Mwrap/PSGI.pm
index 5d143cd..3e8795e 100644
--- a/lib/Devel/Mwrap/PSGI.pm
+++ b/lib/Devel/Mwrap/PSGI.pm
@@ -1,5 +1,7 @@
# Copyright (C) all contributors <mwrap@80x24.org>
# License: GPL-2.0+ <https://www.gnu.org/licenses/gpl-2.0.txt>
+#
+# Note: this is deprecated, use mwrap_httpd.h instead
package Devel::Mwrap::PSGI;
use v5.12; # strict
use warnings;
diff --git a/mwrap_httpd.h b/mwrap_httpd.h
index 1ef21e0..f5c3e1b 100644
--- a/mwrap_httpd.h
+++ b/mwrap_httpd.h
@@ -29,6 +29,7 @@
#include "picohttpparser_c.h"
#include <pthread.h>
#include <stdbool.h>
+#define URL "https://80x24.org/mwrap-perl.git/about"
enum mw_qev {
MW_QEV_IGNORE = 0,
@@ -321,6 +322,15 @@ static enum mw_qev h1_do_reset(struct mw_h1 *h1)
return h1_res_oneshot(h1, r200, sizeof(r200) - 1);
}
+static enum mw_qev h1_do_trim(struct mw_h1 *h1)
+{
+ static const char r200[] = "HTTP/1.1 200 OK\r\n"
+ "Content-Type: text/plain\r\n"
+ "Content-Length: 9\r\n\r\n" "trimming\n";
+ malloc_trim(0);
+ return h1_res_oneshot(h1, r200, sizeof(r200) - 1);
+}
+
#define PATH_SKIP(h1r, pfx) path_skip(h1r, pfx, sizeof(pfx) - 1)
static const char *path_skip(struct mw_h1req *h1r, const char *pfx, size_t len)
{
@@ -633,6 +643,23 @@ static enum mw_qev each_gt(struct mw_h1 *h1, struct mw_h1req *h1r,
return h1_200(h1, &html);
}
+/* /$PID/ root endpoint */
+static enum mw_qev pid_root(struct mw_h1 *h1, struct mw_h1req *h1r)
+{
+ struct mw_fbuf html;
+ FILE *fp = wbuf_init(&html);
+ if (!fp) return h1_close(h1);
+#define default_min "2000"
+
+ FPUTS("<html><head><title>mwrap demo"
+ "</title></head><body><p><a\n"
+ "href=\"each/" default_min "\">allocations >"
+ default_min " bytes</a><p><a\nhref=\""
+ URL "\">" URL "</a></body></html>", fp);
+ return h1_200(h1, &html);
+#undef default_min
+}
+
static enum mw_qev h1_dispatch(struct mw_h1 *h1, struct mw_h1req *h1r)
{
if (h1r->method_len == 3 && !memcmp(h1r->method, "GET", 3)) {
@@ -646,10 +673,14 @@ static enum mw_qev h1_dispatch(struct mw_h1 *h1, struct mw_h1req *h1r)
return each_gt(h1, h1r, min);
} else if ((PATH_SKIP(h1r, "/at/"))) {
return each_at(h1, h1r);
+ } else if (h1r->path_len == 1 && h1r->path[0] == '/') {
+ return pid_root(h1, h1r);
}
} else if (h1r->method_len == 4 && !memcmp(h1r->method, "POST", 4)) {
if (h1r->path_len == 6 && !memcmp(h1r->path, "/reset", 6))
return h1_do_reset(h1);
+ if (h1r->path_len == 5 && !memcmp(h1r->path, "/trim", 5))
+ return h1_do_trim(h1);
}
return h1_404(h1);
}
diff --git a/t/mwrap-httpd.t b/t/mwrap-httpd.t
index aec1780..f300eae 100644
--- a/t/mwrap-httpd.t
+++ b/t/mwrap-httpd.t
@@ -65,6 +65,17 @@ SKIP: {
"http://0/$pid/each/2000");
is($rc, 0, 'curl /each');
unlink($cout);
+
+ $rc = system(qw(curl -vsSf --unix-socket), $sock, '-o', $cout,
+ "http://0/$pid/");
+ is($rc, 0, 'curl / (PID root)');
+ like(slurp($cout), qr/<html>/, 'root shown');
+
+ $rc = system(qw(curl -vsSf -XPOST --unix-socket), $sock, '-o', $cout,
+ "http://0/$pid/trim");
+ is($rc, 0, 'curl / (PID root)');
+ like(slurp($cout), qr/trimming/, 'trim started');
+ unlink($cout);
};
{
next prev parent reply other threads:[~2022-12-15 20:52 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-15 20:52 [PATCH 00/19] another round of httpd improvements Eric Wong
2022-12-15 20:52 ` [PATCH 01/19] mwrap_httpd: show current bytes consistently Eric Wong
2022-12-15 20:52 ` [PATCH 02/19] introduce AUTO_FREE macro to simplify cleanup Eric Wong
2022-12-15 20:52 ` [PATCH 03/19] httpd: rework httpd to use auto-free for memstream Eric Wong
2022-12-15 20:52 ` [PATCH 04/19] httpd: avoid newline if not using bt: >= 1 Eric Wong
2022-12-15 20:52 ` Eric Wong [this message]
2022-12-15 20:52 ` [PATCH 06/19] mwrap_httpd: add info about src_file and src_loc stats Eric Wong
2022-12-15 20:52 ` [PATCH 07/19] use uatomic_inc where appropriate Eric Wong
2022-12-15 20:52 ` [PATCH 08/19] httpd: drop unnecessary AND ops from base-64 Eric Wong
2022-12-15 20:52 ` [PATCH 09/19] mymalloc: add notes on the malloc implementation Eric Wong
2022-12-15 20:52 ` [PATCH 10/19] rproxy: link to mwrap_httpd /$PID/ root without each, too Eric Wong
2022-12-15 20:52 ` [PATCH 11/19] httpd: shrink `mean_life' field to `double' Eric Wong
2022-12-15 20:52 ` [PATCH 12/19] httpd: support CSV output Eric Wong
2022-12-15 20:52 ` [PATCH 13/19] rproxy: enable deflater by default Eric Wong
2022-12-15 20:52 ` [PATCH 14/19] mwrap_httpd: do not abort on fork if out-of-resources Eric Wong
2022-12-15 20:52 ` [PATCH 15/19] httpd: pause forking thread on resource limitations Eric Wong
2022-12-15 20:52 ` [PATCH 16/19] rename mwrap_httpd.h to httpd.h Eric Wong
2022-12-15 20:52 ` [PATCH 17/19] httpd: describe simple and naive buffering scheme Eric Wong
2022-12-15 20:52 ` [PATCH 18/19] httpd: drop TODO item for pipelining Eric Wong
2022-12-15 20:52 ` [PATCH 19/19] avoid -Warray-bounds warning, avoid stack overallocation Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221215205255.27840-6-e@80x24.org \
--to=e@80x24.org \
--cc=mwrap-perl@80x24.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mwrap-perl.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).