diff options
author | Olli Hauer <ohauer@FreeBSD.org> | 2012-01-01 19:30:58 +0000 |
---|---|---|
committer | Olli Hauer <ohauer@FreeBSD.org> | 2012-01-01 19:30:58 +0000 |
commit | 2c96f26a12ae4d0474c70d61c6cab483c2865f49 (patch) | |
tree | 3d7591c78a947273efae6c582aacdca524e69528 /www/mod_backhand | |
parent | - Move all the fetching into fetch phase (diff) |
- remove apache13 and ports depending on apache13 from portstree
( EXPIRATION_DATE=2012-01-01 )
with hat apache@
Notes
Notes:
svn path=/head/; revision=288378
Diffstat (limited to 'www/mod_backhand')
-rw-r--r-- | www/mod_backhand/Makefile | 32 | ||||
-rw-r--r-- | www/mod_backhand/distinfo | 2 | ||||
-rw-r--r-- | www/mod_backhand/files/patch-mod_backhand.c | 10 | ||||
-rw-r--r-- | www/mod_backhand/files/patch-platform.c | 204 | ||||
-rw-r--r-- | www/mod_backhand/pkg-descr | 7 |
5 files changed, 0 insertions, 255 deletions
diff --git a/www/mod_backhand/Makefile b/www/mod_backhand/Makefile deleted file mode 100644 index 99bd8a81b25a..000000000000 --- a/www/mod_backhand/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# New ports collection makefile for: mod_backhand -# Date created: 10 April 2001 -# Whom: will -# -# $FreeBSD$ -# - -PORTNAME= mod_backhand -PORTVERSION= 1.2.2 -PORTREVISION= 1 -CATEGORIES= www -MASTER_SITES= http://mirrors.omniti.com/mod_backhand/ \ - LOCAL/pgollucci -PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} - -MAINTAINER= apache@FreeBSD.org -COMMENT= Apache module that allows seamless redirection and load balancing of HTTP requests - -MAKE_JOBS_SAFE= yes - -DEPRECATED= apache13 is deprecated, migrate to 2.2.x+ now -EXPIRATION_DATE= 2012-01-01 - -USE_APACHE= 13 - -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-apxs=${APXS} - -AP_FAST_BUILD= yes -AP_GENPLIST= yes - -.include <bsd.port.mk> diff --git a/www/mod_backhand/distinfo b/www/mod_backhand/distinfo deleted file mode 100644 index de2dba101f9c..000000000000 --- a/www/mod_backhand/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (mod_backhand-1.2.2.tar.gz) = 0b19b0686c66a085e762ab96cabe6e5737f42aa46aabc5585efaf8e4e8f49c31 -SIZE (mod_backhand-1.2.2.tar.gz) = 261790 diff --git a/www/mod_backhand/files/patch-mod_backhand.c b/www/mod_backhand/files/patch-mod_backhand.c deleted file mode 100644 index 2ea0d47ecd1a..000000000000 --- a/www/mod_backhand/files/patch-mod_backhand.c +++ /dev/null @@ -1,10 +0,0 @@ ---- mod_backhand.c.orig Tue Feb 21 00:42:40 2006 -+++ mod_backhand.c Tue Feb 21 00:43:24 2006 -@@ -427,6 +427,7 @@ - mbcfg *cfg = (mbcfg *) mconfig; - struct cpd *newfunc; - cfg->local = 1; -+ ap_os_dso_error(); - handle = ap_os_dso_load(szFilename); - if(!handle) - return ap_os_dso_error(); diff --git a/www/mod_backhand/files/patch-platform.c b/www/mod_backhand/files/patch-platform.c deleted file mode 100644 index 0e2596579e67..000000000000 --- a/www/mod_backhand/files/patch-platform.c +++ /dev/null @@ -1,204 +0,0 @@ ---- platform.c_1.12.c Tue Nov 28 06:33:52 2006 -+++ platform.c Tue Nov 28 06:25:27 2006 -@@ -1,46 +1,46 @@ -- /* ====================================================================== -- * Copyright (c) 1998-1999 The Johns Hopkins University. -- * All rights reserved. -- * The following code was written by Theo Schlossnagle for use in the -- * Backhand project at The Center for Networking and Distributed Systems -- * at The Johns Hopkins University. -- * Please refer to the LICENSE file before using this software. -- * ====================================================================== -- */ -- /* This is exported for use in builtins.c */ -- int find_highest_arriba(serverstat *ss) { -- int i, highest=0; -- for(i=0;i<HARD_SERVER_LIMIT;i++) -- highest = MAX(highest, -- ss[i].arriba); -- return highest; -- } -- static int find_max_load(serverstat *ss, int ha) { -- int i, highest=0; -- float myaa; -- for(i=0;i<HARD_SERVER_LIMIT;i++) { -- if(ss[i].arriba) myaa = (float)ha/(float)ss[i].arriba; -- else myaa = 0; -- highest = MAX(highest, -- (float)ss[i].load*myaa); -- } -- return highest; -- } -- static int set_high_watermark(void) { -- int i=0, aload, ha; -- ha = find_highest_arriba(serverstats); -- aload = find_max_load(serverstats, ha); -- if(aload>0) aload-=1; /* n - delta */ -- aload /= 1000; /* places hwm @ mag(load)*/ -- aload <<= 1; -- while(aload >>=1) i++; /* log2(1+n-delta) */ -- aload = 1 << i; /* 2^(n+1) */ -- for(i=0;i<HARD_SERVER_LIMIT;i++) -- aload = MAX(aload, serverstats[i].load_hwm/1000); -- return aload; -- } -+/* ====================================================================== -+ * Copyright (c) 1998-1999 The Johns Hopkins University. -+ * All rights reserved. -+ * The following code was written by Theo Schlossnagle for use in the -+ * Backhand project at The Center for Networking and Distributed Systems -+ * at The Johns Hopkins University. -+ * Please refer to the LICENSE file before using this software. -+ * ====================================================================== -+*/ -+/* This is exported for use in builtins.c */ -+int find_highest_arriba(serverstat *ss) { -+ int i, highest=0; -+ for(i=0;i<HARD_SERVER_LIMIT;i++) -+ highest = MAX(highest, -+ ss[i].arriba); -+ return highest; -+} -+static int find_max_load(serverstat *ss, int ha) { -+ int i, highest=0; -+ float myaa; -+ for(i=0;i<HARD_SERVER_LIMIT;i++) { -+ if(ss[i].arriba) myaa = (float)ha/(float)ss[i].arriba; -+ else myaa = 0; -+ highest = MAX(highest, -+ (float)ss[i].load*myaa); -+ } -+ return highest; -+} -+static int set_high_watermark(void) { -+ int i=0, aload, ha; -+ ha = find_highest_arriba(serverstats); -+ aload = find_max_load(serverstats, ha); -+ if(aload>0) aload-=1; /* n - delta */ -+ aload /= 1000; /* places hwm @ mag(load)*/ -+ aload <<= 1; -+ while(aload >>=1) i++; /* log2(1+n-delta) */ -+ aload = 1 << i; /* 2^(n+1) */ -+ for(i=0;i<HARD_SERVER_LIMIT;i++) -+ aload = MAX(aload, serverstats[i].load_hwm/1000); -+ return aload; -+} - -- #ifdef LINUX -+#ifdef LINUX - #ifndef CPUSTATES - #define CPUSTATES 4 - #endif -@@ -143,23 +143,42 @@ - ourcpu = (ourcpu==0.0)?0.0:(states[0]/ourcpu); //states[0] == IDLE - ourcpu *= 1000.0; - /* Find the memory now */ -- tmem = -1; -- amem = -1; -+ tmem = 0; -+ amem = 0; -+ - if((proc_stat=fopen(MEMFILE,"r")) == NULL) { - perror(MEMFILE); - } else { -+ long long int tm, um, fm, sm, bm, cm; -+ tm=-1; um=-1; fm=-1; sm=-1; bm=-1; cm=-1; -+ - while(fgets(dummy, 100, proc_stat)) { - if(strncmp(dummy, "Mem:", 4)==0) { -- int tm, um, fm, sm, bm, cm; -- sscanf(dummy+5, "%d %d %d %d %d %d", &tm, &um, &fm, &sm, &bm, &cm); -- tmem=tm/(1024*1024); -- fm /= (1024*1024); -- bm /= (1024*1024); -- cm /= (1024*1024); -- amem=MAX(fm+bm+cm-5, 0); // Free + Cached + Buffered ??? -- break; -+ sscanf(dummy+5, "%Ld %Ld %Ld %Ld %Ld %Ld", &tm, &um, &fm, &sm, &bm, &cm); -+ tmem=tm/(1024*1024); -+ fm /= (1024*1024); -+ bm /= (1024*1024); -+ cm /= (1024*1024); -+ break; -+ } -+ if(strncmp(dummy, "MemTotal:", 9)==0) { -+ sscanf(dummy+9, "%Ld kB", &tm); -+ tmem = tm/(1024); -+ } -+ if(strncmp(dummy, "Cached:", 7)==0) { -+ sscanf(dummy+7, "%Ld kB", &cm); -+ cm /= (1024); -+ } -+ if(strncmp(dummy, "Buffers:", 8)==0) { -+ sscanf(dummy+8, "%Ld kB", &bm); -+ bm /= (1024); -+ } -+ if(strncmp(dummy, "MemFree:", 8)==0) { -+ sscanf(dummy+8, "%Ld kB", &fm); -+ fm /= (1024); - } - } -+ amem=MAX(fm+bm+cm-5, 0); // Free + Cached + Buffered ??? - fclose(proc_stat); - } - /* Find the load now */ -@@ -267,10 +286,10 @@ - kstat_named_t *kn; - syspages = k; - if(kstat_read(kctl, syspages, 0)!=-1 && -- (kn = (kstat_named_t *)kstat_data_lookup(syspages, "physmem"))!=NULL) -+ (kn = (kstat_named_t *)kstat_data_lookup(syspages, "physmem"))!=NULL) { - kn->value.ul /= 1024; /* pgsize in kb, we want mb */ - physmem = pgsize*kn->value.ul; -- else -+ } else - physmem = 0; - } else if(!strncmp(k->ks_name, "system_misc", 11)) { - sysmisc = k; -@@ -383,10 +402,10 @@ - ss->tmem = physmem; - if(syspages && - kstat_read(kctl, syspages, 0)!=-1 && -- ((kn = (kstat_named_t *)kstat_data_lookup(syspages, "freemem"))!=NULL)) -+ ((kn = (kstat_named_t *)kstat_data_lookup(syspages, "freemem"))!=NULL)) { - kn->value.ul /= 1024; /* pgsize in kb, we want mb */ - ss->amem = pgsize*kn->value.ul; -- else -+ } else - ss->amem = 0; - if(!ss->contact.sin_port) - if(webport) { -@@ -538,10 +557,12 @@ - void initstat(void) { - int mib[2]; - size_t len; -+ long long int memsize; - mib[0] = CTL_HW; - mib[1] = HW_USERMEM; -- len = sizeof(int); -- sysctl(mib, 2, &usermem, &len, NULL, 0); -+ len = sizeof(long long int); -+ sysctl(mib, 2, &memsize, &len, NULL, 0); -+ usermem = (len==4)?(unsigned int) memsize/(1024*1024):(int) (memsize/(1024*1024)); - mib[1] = HW_NCPU; - sysctl(mib, 2, &ncpu, &len, NULL, 0); - mib[1] = HW_PAGESIZE; -@@ -577,7 +598,7 @@ - sysctl(mib, 2, &ourload, &len, NULL, 0); - ss->load = (int)1000.0*((float)ourload.ldavg[0]/(float)ourload.fscale); - ss->load_hwm=set_high_watermark()*1000; -- ss->tmem=(int)usermem/(1024*1024); /* in mb */ -+ ss->tmem=usermem; - #ifdef VM_TOTAL - mib[1] = VM_TOTAL; - #else -@@ -589,8 +610,7 @@ - #endif - len = sizeof(struct vmtotal); - sysctl(mib, 2, &ourmem, &len, NULL, 0); -- ourmem.t_free /= 1024*1024; /* calculate in mb */ -- ss->amem=(int)usermem-(ourpagesize*ourmem.t_free); -+ ss->amem=(int)(ourpagesize*((unsigned long long int)ourmem.t_free)/(1024*1024)); - ss->cpu =(int)ourcpu; - ss->ncpu=(int)ncpu; - /* Fill out hostname */ diff --git a/www/mod_backhand/pkg-descr b/www/mod_backhand/pkg-descr deleted file mode 100644 index 5436a0e26d35..000000000000 --- a/www/mod_backhand/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -mod_backhand is a project that allows load balancing through seamless -HTTP proxying from one web server to another. This proxying is used -to evenly distribute the load of a site across multiple machines so -that under-utilized resources are utilized to their fullest, thus -providing fine-grained, per-request HTTP load balancing for a cluster. - -WWW: http://www.backhand.org/mod_backhand/ |