Date: Tue, 15 May 2012 19:11:51 -0700 From: Timothy Beyer <beyert@cs.ucr.edu> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Timothy Beyer <beyert@cs.ucr.edu> Subject: ports/167944: update port: lang/urweb Message-ID: <873970swm0.wl@fastmail.fm> Resent-Message-ID: <201205160220.q4G2K2D8097173@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 167944
>Category: ports
>Synopsis: update port: lang/urweb
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed May 16 02:20:01 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Timothy Beyer
>Release: FreeBSD 9.0-RELEASE i386
>Organization:
no organization
>Environment:
System: FreeBSD aeonserv.aeonnet 9.0-RELEASE-p1 FreeBSD 9.0-RELEASE-p1 #11: Fri May 11 22:49:12 PDT 2012 root@aeonserv.aeonnet:/usr/obj/usr/src/sys/CUSTOM i386
>Description:
- Update to version 20120512.
- Get rid of patch-urweb.c, since these changes made it into the upstream version.
>How-To-Repeat:
apply the patch and build
>Fix:
Apply the patch and build
--- urweb.diff begins here ---
Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -3,12 +3,11 @@
# Whom: Timothy Beyer <beyert@cs.ucr.edu>
#
# $FreeBSD: ports/lang/urweb/Makefile,v 1.2 2012/04/09 11:54:04 scheidell Exp $
PORTNAME= urweb
-PORTVERSION= 20120329
-PORTREVISION= 1
+PORTVERSION= 20120512
CATEGORIES= lang www
MASTER_SITES= http://www.impredicative.com/ur/
EXTRACT_SUFX= .tgz
MAINTAINER= beyert@cs.ucr.edu
Index: distinfo
==================================================================
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (urweb-20120329.tgz) = 9f6866bc5663f173157ae6e822bde728581ebdbd2aeb3bb3a1ecf0c0964e691f
-SIZE (urweb-20120329.tgz) = 828756
+SHA256 (urweb-20120512.tgz) = 35a8e7481caa74fc224f556807844899043b3af2c8bae085b9204275318e9d25
+SIZE (urweb-20120512.tgz) = 838543
DELETED files/patch-urweb.c
Index: files/patch-urweb.c
==================================================================
--- patch-urweb.c
+++ /dev/null
@@ -1,54 +0,0 @@
---- src/c/urweb.c.orig Thu Mar 29 11:23:35 2012 -0400
-+++ src/c/urweb.c Sun Apr 08 13:47:57 2012 -0700
-@@ -159,13 +159,7 @@
- static client **clients, *clients_free, *clients_used;
- static unsigned n_clients;
-
--static pthread_mutex_t clients_mutex =
-- #ifdef PTHREAD_RECURSIVE_MUTEX_INITIALIZER
-- PTHREAD_RECURSIVE_MUTEX_INITIALIZER
-- #else
-- PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
-- #endif
-- ;
-+static pthread_mutex_t clients_mutex = PTHREAD_MUTEX_INITIALIZER;
- size_t uw_messages_max = SIZE_MAX;
- size_t uw_clients_max = SIZE_MAX;
-
-@@ -230,20 +224,23 @@
- }
-
- static const char begin_msgs[] = "Content-type: text/plain\r\n\r\n";
-+static pthread_t pruning_thread;
-+static int pruning_thread_initialized = 0;
-
- static client *find_client(unsigned id) {
- client *c;
--
-- pthread_mutex_lock(&clients_mutex);
-+ int i_am_pruner = pruning_thread_initialized && pthread_equal(pruning_thread, pthread_self());
-+
-+ if (!i_am_pruner) pthread_mutex_lock(&clients_mutex);
-
- if (id >= n_clients) {
-- pthread_mutex_unlock(&clients_mutex);
-+ if (!i_am_pruner) pthread_mutex_unlock(&clients_mutex);
- return NULL;
- }
-
- c = clients[id];
-
-- pthread_mutex_unlock(&clients_mutex);
-+ if (!i_am_pruner) pthread_mutex_unlock(&clients_mutex);
- return c;
- }
-
-@@ -3291,6 +3288,8 @@
- cutoff = time(NULL) - ctx->app->timeout;
-
- pthread_mutex_lock(&clients_mutex);
-+ pruning_thread = pthread_self();
-+ pruning_thread_initialized = 1;
-
- for (c = clients_used; c; c = next) {
- next = c->next;
--- urweb.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?873970swm0.wl>