Blame

Date:
Message:
drop useless struct instead of keeping the struct mcache that's private to mcache.c and used only once, just define its fields as (static) variables. While here, mark as static also gemtext_prefixes.
Actions:
History | Blob | Raw File
  1 d5af38cc 2022-01-10 op /*

  2 d5af38cc 2022-01-10 op  * Copyright (c) 2022 Omar Polo <op@omarpolo.com>

  3 d5af38cc 2022-01-10 op  *

  4 d5af38cc 2022-01-10 op  * Permission to use, copy, modify, and distribute this software for any

  5 d5af38cc 2022-01-10 op  * purpose with or without fee is hereby granted, provided that the above

  6 d5af38cc 2022-01-10 op  * copyright notice and this permission notice appear in all copies.

  7 d5af38cc 2022-01-10 op  *

  8 d5af38cc 2022-01-10 op  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

  9 d5af38cc 2022-01-10 op  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

 10 d5af38cc 2022-01-10 op  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR

 11 d5af38cc 2022-01-10 op  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

 12 d5af38cc 2022-01-10 op  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

 13 d5af38cc 2022-01-10 op  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

 14 d5af38cc 2022-01-10 op  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 15 d5af38cc 2022-01-10 op  */

 16 d5af38cc 2022-01-10 op 

 17 d5af38cc 2022-01-10 op #include "compat.h"

 18 d5af38cc 2022-01-10 op 

 19 d5af38cc 2022-01-10 op #include <stdlib.h>

 20 d5af38cc 2022-01-10 op #include <stdint.h>

 21 d5af38cc 2022-01-10 op #include <string.h>

 22 d5af38cc 2022-01-10 op 

 23 d5af38cc 2022-01-10 op #include "telescope.h"

 24 d5af38cc 2022-01-10 op #include "mcache.h"

 25 8f3c9af8 2022-01-11 op #include "parser.h"

 26 9d65b1d9 2022-01-11 op #include "utils.h"

 27 d5af38cc 2022-01-10 op 

 28 a96922a1 2022-01-11 op static const char *gemtext_prefixes[] = {

 29 d5af38cc 2022-01-10 op 	[LINE_TEXT] = "",

 30 d5af38cc 2022-01-10 op 	[LINE_TITLE_1] = "# ",

 31 d5af38cc 2022-01-10 op 	[LINE_TITLE_2] = "## ",

 32 d5af38cc 2022-01-10 op 	[LINE_TITLE_3] = "### ",

 33 d5af38cc 2022-01-10 op 	[LINE_ITEM] = "* ",

 34 d5af38cc 2022-01-10 op 	[LINE_QUOTE] = "> ",

 35 d5af38cc 2022-01-10 op 	[LINE_PRE_START] = "``` ",

 36 d5af38cc 2022-01-10 op 	[LINE_PRE_CONTENT] = "",

 37 d5af38cc 2022-01-10 op 	[LINE_PRE_END] = "```",

 38 d5af38cc 2022-01-10 op };

 39 d5af38cc 2022-01-10 op 

 40 4b4c3458 2022-01-11 op static struct timeval tv = { 60, 0 };

 41 4b4c3458 2022-01-11 op static struct event timerev;

 42 4b4c3458 2022-01-11 op 

 43 a96922a1 2022-01-11 op static struct ohash	h;

 44 a96922a1 2022-01-11 op static size_t		npages;

 45 a96922a1 2022-01-11 op static size_t		tot;

 46 d5af38cc 2022-01-10 op 

 47 d5af38cc 2022-01-10 op struct mcache_entry {

 48 4b4c3458 2022-01-11 op 	time_t		 ts;

 49 4e3871f5 2022-01-11 op 	const char	*parser_name;

 50 d5af38cc 2022-01-10 op 	int		 trust;

 51 d5af38cc 2022-01-10 op 	struct evbuffer	*evb;

 52 d5af38cc 2022-01-10 op 	char		 url[];

 53 d5af38cc 2022-01-10 op };

 54 d5af38cc 2022-01-10 op 

 55 ffcd827c 2022-01-11 op static void

 56 ffcd827c 2022-01-11 op mcache_free_entry(const char *url)

 57 ffcd827c 2022-01-11 op {

 58 ffcd827c 2022-01-11 op 	struct mcache_entry	*e;

 59 ffcd827c 2022-01-11 op 	unsigned int		 slot;

 60 ffcd827c 2022-01-11 op 

 61 a96922a1 2022-01-11 op 	slot = ohash_qlookup(&h, url);

 62 a96922a1 2022-01-11 op 	if ((e = ohash_remove(&h, slot)) == NULL)

 63 ffcd827c 2022-01-11 op 		return;

 64 ffcd827c 2022-01-11 op 

 65 a96922a1 2022-01-11 op 	npages--;

 66 a96922a1 2022-01-11 op 	tot -= EVBUFFER_LENGTH(e->evb);

 67 befa807e 2022-01-11 op 

 68 ffcd827c 2022-01-11 op 	evbuffer_free(e->evb);

 69 ffcd827c 2022-01-11 op 	free(e);

 70 ffcd827c 2022-01-11 op }

 71 ffcd827c 2022-01-11 op 

 72 4b4c3458 2022-01-11 op static void

 73 4b4c3458 2022-01-11 op clean_old_entries(int fd, short ev, void *data)

 74 4b4c3458 2022-01-11 op {

 75 4b4c3458 2022-01-11 op 	struct mcache_entry	*e;

 76 4b4c3458 2022-01-11 op 	unsigned int		 i;

 77 4b4c3458 2022-01-11 op 	time_t			 treshold;

 78 4b4c3458 2022-01-11 op 

 79 4b4c3458 2022-01-11 op 	treshold = time(NULL) - 15 * 60;

 80 4b4c3458 2022-01-11 op 

 81 a96922a1 2022-01-11 op 	for (e = ohash_first(&h, &i); e != NULL; e = ohash_next(&h, &i))

 82 4b4c3458 2022-01-11 op 		if (e->ts < treshold)

 83 4b4c3458 2022-01-11 op 			mcache_free_entry(e->url);

 84 4b4c3458 2022-01-11 op 

 85 4b4c3458 2022-01-11 op 	evtimer_add(&timerev, &tv);

 86 4b4c3458 2022-01-11 op }

 87 4b4c3458 2022-01-11 op 

 88 d5af38cc 2022-01-10 op void

 89 d5af38cc 2022-01-10 op mcache_init(void)

 90 d5af38cc 2022-01-10 op {

 91 d5af38cc 2022-01-10 op 	struct ohash_info info = {

 92 d5af38cc 2022-01-10 op 		.key_offset = offsetof(struct mcache_entry, url),

 93 d5af38cc 2022-01-10 op 		.calloc = hash_calloc,

 94 d5af38cc 2022-01-10 op 		.free = hash_free,

 95 d5af38cc 2022-01-10 op 		.alloc = hash_alloc,

 96 d5af38cc 2022-01-10 op 	};

 97 d5af38cc 2022-01-10 op 

 98 a96922a1 2022-01-11 op 	ohash_init(&h, 5, &info);

 99 4b4c3458 2022-01-11 op 

100 4b4c3458 2022-01-11 op 	evtimer_set(&timerev, clean_old_entries, NULL);

101 d5af38cc 2022-01-10 op }

102 d5af38cc 2022-01-10 op 

103 d5af38cc 2022-01-10 op int

104 8f3c9af8 2022-01-11 op mcache_tab(struct tab *tab)

105 d5af38cc 2022-01-10 op {

106 d5af38cc 2022-01-10 op 	struct mcache_entry	*e;

107 d5af38cc 2022-01-10 op 	struct line		*line;

108 d5af38cc 2022-01-10 op 	unsigned int		 slot;

109 d5af38cc 2022-01-10 op 	size_t			 l, len;

110 8f3c9af8 2022-01-11 op 	const char		*url;

111 d5af38cc 2022-01-10 op 

112 8f3c9af8 2022-01-11 op 	url = tab->hist_cur->h;

113 d5af38cc 2022-01-10 op 	l = strlen(url);

114 d5af38cc 2022-01-10 op 	len = sizeof(*e) + l + 1;

115 d5af38cc 2022-01-10 op 

116 d5af38cc 2022-01-10 op 	if ((e = calloc(1, len)) == NULL)

117 d5af38cc 2022-01-10 op 		return -1;

118 4b4c3458 2022-01-11 op 	e->ts = time(NULL);

119 4e3871f5 2022-01-11 op 	e->parser_name = tab->buffer.page.name;

120 8f3c9af8 2022-01-11 op 	e->trust = tab->trust;

121 d5af38cc 2022-01-10 op 	memcpy(e->url, url, l);

122 d5af38cc 2022-01-10 op 

123 d5af38cc 2022-01-10 op 	if ((e->evb = evbuffer_new()) == NULL)

124 d5af38cc 2022-01-10 op 		goto err;

125 d5af38cc 2022-01-10 op 

126 8f3c9af8 2022-01-11 op 	TAILQ_FOREACH(line, &tab->buffer.page.head, lines) {

127 d5af38cc 2022-01-10 op 		const char	*text, *alt;

128 d5af38cc 2022-01-10 op 		int		 r;

129 d5af38cc 2022-01-10 op 

130 d5af38cc 2022-01-10 op 		if ((text = line->line) == NULL)

131 d5af38cc 2022-01-10 op 			text = "";

132 d5af38cc 2022-01-10 op 

133 d5af38cc 2022-01-10 op 		if ((alt = line->alt) == NULL)

134 d5af38cc 2022-01-10 op 			alt = "";

135 d5af38cc 2022-01-10 op 

136 d5af38cc 2022-01-10 op 		switch (line->type) {

137 d5af38cc 2022-01-10 op 		case LINE_TEXT:

138 d5af38cc 2022-01-10 op 		case LINE_TITLE_1:

139 d5af38cc 2022-01-10 op 		case LINE_TITLE_2:

140 d5af38cc 2022-01-10 op 		case LINE_TITLE_3:

141 d5af38cc 2022-01-10 op 		case LINE_ITEM:

142 d5af38cc 2022-01-10 op 		case LINE_QUOTE:

143 d5af38cc 2022-01-10 op 		case LINE_PRE_START:

144 d5af38cc 2022-01-10 op 		case LINE_PRE_CONTENT:

145 d5af38cc 2022-01-10 op 		case LINE_PRE_END:

146 d5af38cc 2022-01-10 op 			r = evbuffer_add_printf(e->evb, "%s%s\n",

147 d5af38cc 2022-01-10 op 			    gemtext_prefixes[line->type], text);

148 d5af38cc 2022-01-10 op 			break;

149 d5af38cc 2022-01-10 op 

150 d5af38cc 2022-01-10 op 		case LINE_LINK:

151 d5af38cc 2022-01-10 op 			r = evbuffer_add_printf(e->evb, "=> %s %s\n",

152 d5af38cc 2022-01-10 op 			    alt, text);

153 d5af38cc 2022-01-10 op 			break;

154 d5af38cc 2022-01-10 op 

155 d5af38cc 2022-01-10 op 		case LINE_PATCH:

156 d5af38cc 2022-01-10 op 		case LINE_PATCH_HDR:

157 d5af38cc 2022-01-10 op 		case LINE_PATCH_HUNK_HDR:

158 d5af38cc 2022-01-10 op 		case LINE_PATCH_ADD:

159 d5af38cc 2022-01-10 op 		case LINE_PATCH_DEL:

160 d5af38cc 2022-01-10 op 			/* TODO */

161 d5af38cc 2022-01-10 op 			r = -1;

162 d5af38cc 2022-01-10 op 			break;

163 d5af38cc 2022-01-10 op 

164 d5af38cc 2022-01-10 op 		case LINE_COMPL:

165 d5af38cc 2022-01-10 op 		case LINE_COMPL_CURRENT:

166 d5af38cc 2022-01-10 op 		case LINE_HELP:

167 d5af38cc 2022-01-10 op 		case LINE_DOWNLOAD:

168 d5af38cc 2022-01-10 op 		case LINE_DOWNLOAD_DONE:

169 d5af38cc 2022-01-10 op 		case LINE_DOWNLOAD_INFO:

170 d5af38cc 2022-01-10 op 		case LINE_FRINGE:

171 d5af38cc 2022-01-10 op 			/* not reached */

172 d5af38cc 2022-01-10 op 			abort();

173 d5af38cc 2022-01-10 op 		}

174 d5af38cc 2022-01-10 op 

175 d5af38cc 2022-01-10 op 		if (r == -1)

176 d5af38cc 2022-01-10 op 			goto err;

177 d5af38cc 2022-01-10 op 	}

178 d5af38cc 2022-01-10 op 

179 ffcd827c 2022-01-11 op 	/* free any previously cached copies of this page */

180 ffcd827c 2022-01-11 op 	mcache_free_entry(url);

181 ffcd827c 2022-01-11 op 

182 a96922a1 2022-01-11 op 	slot = ohash_qlookup(&h, url);

183 a96922a1 2022-01-11 op 	ohash_insert(&h, slot, e);

184 befa807e 2022-01-11 op 

185 a96922a1 2022-01-11 op 	npages++;

186 a96922a1 2022-01-11 op 	tot += EVBUFFER_LENGTH(e->evb);

187 befa807e 2022-01-11 op 

188 4b4c3458 2022-01-11 op 	if (!evtimer_pending(&timerev, NULL))

189 4b4c3458 2022-01-11 op 		evtimer_add(&timerev, &tv);

190 4b4c3458 2022-01-11 op 

191 d5af38cc 2022-01-10 op 	return 0;

192 d5af38cc 2022-01-10 op 

193 d5af38cc 2022-01-10 op err:

194 d5af38cc 2022-01-10 op 	if (e->evb != NULL)

195 d5af38cc 2022-01-10 op 		evbuffer_free(e->evb);

196 d5af38cc 2022-01-10 op 	free(e);

197 d5af38cc 2022-01-10 op 	return -1;

198 d5af38cc 2022-01-10 op }

199 d5af38cc 2022-01-10 op 

200 d5af38cc 2022-01-10 op int

201 8f3c9af8 2022-01-11 op mcache_lookup(const char *url, struct tab *tab)

202 d5af38cc 2022-01-10 op {

203 d5af38cc 2022-01-10 op 	struct mcache_entry	*e;

204 d5af38cc 2022-01-10 op 	unsigned int		 slot;

205 d5af38cc 2022-01-10 op 

206 a96922a1 2022-01-11 op 	slot = ohash_qlookup(&h, url);

207 a96922a1 2022-01-11 op 	if ((e = ohash_find(&h, slot)) == NULL)

208 d5af38cc 2022-01-10 op 		return 0;

209 d5af38cc 2022-01-10 op 

210 8f3c9af8 2022-01-11 op 	parser_init(tab, gemtext_initparser);

211 8f3c9af8 2022-01-11 op 	if (!parser_parse(tab, EVBUFFER_DATA(e->evb), EVBUFFER_LENGTH(e->evb)))

212 8f3c9af8 2022-01-11 op 		goto err;

213 8f3c9af8 2022-01-11 op 	if (!parser_free(tab))

214 8f3c9af8 2022-01-11 op 		goto err;

215 8f3c9af8 2022-01-11 op 

216 4e3871f5 2022-01-11 op 	tab->buffer.page.name = e->parser_name;

217 8f3c9af8 2022-01-11 op 	tab->trust = e->trust;

218 d5af38cc 2022-01-10 op 	return 1;

219 8f3c9af8 2022-01-11 op 

220 8f3c9af8 2022-01-11 op err:

221 8f3c9af8 2022-01-11 op 	parser_free(tab);

222 8f3c9af8 2022-01-11 op 	erase_buffer(&tab->buffer);

223 8f3c9af8 2022-01-11 op 	return 0;

224 d5af38cc 2022-01-10 op }

225 befa807e 2022-01-11 op 

226 befa807e 2022-01-11 op void

227 a96922a1 2022-01-11 op mcache_info(size_t *r_npages, size_t *r_tot)

228 befa807e 2022-01-11 op {

229 a96922a1 2022-01-11 op 	*r_npages = npages;

230 a96922a1 2022-01-11 op 	*r_tot = tot;

231 befa807e 2022-01-11 op }