From ac1323d459a93ae22a1988ce95ba09ebaa749dc6 Mon Sep 17 00:00:00 2001 From: David Schmidt Date: Sat, 28 Dec 2002 04:10:22 +0000 Subject: [PATCH] Initial drop of dashboard instrumentation - enabled with --enable-activity-console --- GNUmakefile.in | 15 +++++++++++---- config | 14 +++++++++++++- configure.in | 29 +++++++++++++++++++++++------ 3 files changed, 47 insertions(+), 11 deletions(-) diff --git a/GNUmakefile.in b/GNUmakefile.in index 62e96cfa..5161009e 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,6 +1,6 @@ # Note: Makefile is built automatically from Makefile.in # -# $Id: GNUmakefile.in,v 1.134 2002/10/28 06:01:39 hal9 Exp $ +# $Id: GNUmakefile.in,v 1.135 2002/11/04 05:11:05 hal9 Exp $ # # Written by and Copyright (C) 2001 the SourceForge # Privoxy team. http://www.privoxy.org/ @@ -226,6 +226,10 @@ PCRE_SRC = @STATIC_PCRE_ONLY@$(DIR_PRIVOXY_SRC_PCRE)/get.c $(DIR_PRIVOXY_SRC PCRE_OBJS = @STATIC_PCRE_ONLY@$(PCRE_SRC:$(DIR_PRIVOXY_SRC_PCRE)/%.c=$(DIR_PRIVOXY_OBJ)/%.@OBJEXT@) PCRE_HDRS = @STATIC_PCRE_ONLY@$(DIR_PRIVOXY_SRC_PCRE)/config.h $(DIR_PRIVOXY_SRC_PCRE)/chartables.c $(DIR_PRIVOXY_SRC_PCRE)/internal.h $(DIR_PRIVOXY_SRC_PCRE)/pcre.h +ACTIVITY_SRC = @ACTIVITY_ONLY@$(DIR_PRIVOXY_SRC)/stats.c +ACTIVITY_OBJS = @ACTIVITY_ONLY@$(ACTIVITY_SRC:$(DIR_PRIVOXY_SRC)/%.c=$(DIR_PRIVOXY_OBJ)/%.@OBJEXT@) +ACTIVITY_HDRS = @ACTIVITY_ONLY@$(ACTIVITY_SRC:.c=.h) $(DIR_PRIVOXY_SRC)/ipc.h + # No REGEX (maybe because dynamically linked pcreposix): REGEX_SRC = @STATIC_PCRE_ONLY@REGEX_SRC = $(DIR_PRIVOXY_SRC_PCRE)/pcreposix.c @@ -242,9 +246,9 @@ SOCKET_LIB = @SOCKET_LIB@ # PThreads library, if needed. PTHREAD_LIB = @PTHREAD_ONLY@@PTHREAD_LIB@ -SRCS = $(C_SRC) $(W32_SRC) $(PCRS_SRC) $(PCRE_SRC) $(REGEX_SRC) -OBJS = $(C_OBJS) $(W32_OBJS) $(PCRS_OBJS) $(PCRE_OBJS) $(REGEX_OBJS) -HDRS = $(C_HDRS) $(W32_HDRS) $(PCRS_HDRS) $(PCRE_OBJS) $(REGEX_HDRS) +SRCS = $(C_SRC) $(W32_SRC) $(PCRS_SRC) $(PCRE_SRC) $(REGEX_SRC) $(ACTIVITY_SRC) +OBJS = $(C_OBJS) $(W32_OBJS) $(PCRS_OBJS) $(PCRE_OBJS) $(REGEX_OBJS) $(ACTIVITY_OBJS) +HDRS = $(C_HDRS) $(W32_HDRS) $(PCRS_HDRS) $(PCRE_OBJS) $(REGEX_HDRS) $(ACTIVITY_HDRS) LIBS = @LIBS@ $(W32_LIB) $(SOCKET_LIB) $(PTHREAD_LIB) @@ -1141,6 +1145,9 @@ coffee: ## end: # $Log: GNUmakefile.in,v $ +# Revision 1.135 2002/11/04 05:11:05 hal9 +# Just a clean up of overly verbose output from install/uninstall. +# # Revision 1.134 2002/10/28 06:01:39 hal9 # Make uninstall: cp -v problems on SF Solaris. # diff --git a/config b/config index 4b806d26..f4831234 100644 --- a/config +++ b/config @@ -2,7 +2,7 @@ # # Copyright (C) 2001, 2002 Privoxy Developers http://privoxy.org # -# $Id: config,v 1.40 2002/09/05 16:36:44 hal9 Exp $ +# $Id: config,v 1.41 2002/10/09 01:45:33 hal9 Exp $ # #################################################################### # # @@ -1060,4 +1060,16 @@ buffer-limit 4096 # #hide-console +# The experimental "activity-console-address" option is used to +# specify where statistical information should be sent for monitoring +# by the activity console. +# +#activity-console-address 127.0.0.1:8119 + +# The experimental "activity-console-update-freq" option is used to +# specify how often (in seconds) statistics should be forwarded to the +# activity console. +# +#activity-console-update-freq 5 + # diff --git a/configure.in b/configure.in index 70a3b707..2f16841c 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. dnl -dnl $Id: configure.in,v 1.85 2002/11/27 12:40:54 oes Exp $ +dnl $Id: configure.in,v 1.86 2002/12/13 23:47:10 hal9 Exp $ dnl dnl Written by and Copyright (C) 2001, 2002 the SourceForge dnl Privoxy team. http://www.privoxy.org/ @@ -28,6 +28,9 @@ dnl or write to the Free Software Foundation, Inc., 59 dnl Temple Place - Suite 330, Boston, MA 02111-1307, USA. dnl dnl $Log: configure.in,v $ +dnl Revision 1.86 2002/12/13 23:47:10 hal9 +dnl Add openbsd special flags per gunner at styx2002.no-ip.org +dnl dnl Revision 1.85 2002/11/27 12:40:54 oes dnl Fixed broken handling of pre-set CFLAGS dnl @@ -433,7 +436,7 @@ dnl ================================================================= dnl AutoConf Initialization dnl ================================================================= -AC_REVISION($Revision: 1.85 $) +AC_REVISION($Revision: 1.86 $) AC_INIT(src/jcc.c) if test ! -f src/config.h.in; then echo "You need to run autoheader first. " @@ -551,7 +554,7 @@ AC_ARG_WITH(user, [ if test "x$withval" != "xyes"; then if test $ID = no ; then - AC_MSG_ERROR(There is no 'id' program on this system) + AC_MSG_WARN(There is no 'id' program on this system) else AC_MSG_RESULT($with_user) $ID $with_user 2>/dev/null >/dev/null @@ -567,7 +570,7 @@ AC_ARG_WITH(user, ], [ if test $ID = no ; then - AC_MSG_ERROR(There is no 'id' programm on this system) + AC_MSG_WARN(There is no 'id' program on this system) else AC_MSG_RESULT(none specified) USER=$with_user @@ -604,7 +607,7 @@ AC_ARG_WITH(group, ], [ if test $BGROUPS = no ; then - AC_MSG_ERROR(There is no 'groups' programm on this system) + AC_MSG_WARN(There is no 'groups' program on this system) else AC_MSG_RESULT(none specified) GROUP=$with_group; @@ -1079,6 +1082,20 @@ if test $enableval2 = yes; then [ Enables statistics function. ]) fi +AC_ARG_ENABLE(activity-console, +[ --enable-activity-console Gather and send extended statistics to the activity console], +[enableval2=$enableval], +[enableval2=no]) +if test $enableval2 = yes; then + ACTIVITY_ONLY= + AC_DEFINE(FEATURE_ACTIVITY_CONSOLE,1, + [ Enables sending statistics to the activity console. This is currently + experimental, and will require some porting work for a few more platforms. ]) + else + ACTIVITY_ONLY=# +fi +AC_SUBST(ACTIVITY_ONLY) + AC_ARG_ENABLE(ie-images, [ --enable-ie-images Don't auto-detect whether a request from MS Internet Explorer is for an image or HTML.], @@ -1172,7 +1189,7 @@ AC_ARG_ENABLE(no-gifs, [enableval2=no]) if test $enableval2 = yes; then AC_DEFINE(FEATURE_NO_GIFS,1, - [ Deine to 1 to use PNG instead of GIF for built-in images. ]) + [ Define to 1 to use PNG instead of GIF for built-in images. ]) fi dnl pcre/pcrs is needed for CGI anyway, so -- 2.39.2