rbb 99/05/16 06:24:50
Added: apr/time/unix Makefile.in access.c atime.h time.c Log: First pass at the timing functions. Revision Changes Path 1.1 apache-apr/apr/time/unix/Makefile.in Index: Makefile.in =================================================================== #CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS) #LIBS=$(EXTRA_LIBS) $(LIBS1) #INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES) #LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS) [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @CFLAGS@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LDLIBS) INCDIR=../../include INCDIR1=../../../include INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I. LIB=../libtime.a OBJS=time.o \ access.o .c.o: $(CC) $(CFLAGS) -c $(INCLUDES) $< all: $(LIB) clean: $(RM) -f *.o *.a *.so distclean: clean -$(RM) -f Makefile $(OBJS): Makefile $(LIB): $(OBJS) $(RM) -f $@ $(AR) cr $@ $(OBJS) $(RANLIB) $@ # # We really don't expect end users to use this rule. It works only with # gcc, and rebuilds Makefile.tmpl. You have to re-run Configure after # using it. # depend: cp Makefile.in Makefile.in.bak \ && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.in > Makefile.new \ && gcc -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \ && sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \ -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \ > Makefile.in \ && rm Makefile.new # DO NOT REMOVE access.o: access.c atime.h ../../../include/apr_time.h \ ../../../include/apr_general.h ../../../include/apr_errno.h \ $(INCDIR)/apr_lib.h $(INCDIR)/apr_config.h \ $(INCDIR)/hsregex.h time.o: time.c atime.h ../../../include/apr_time.h \ ../../../include/apr_general.h ../../../include/apr_errno.h \ $(INCDIR)/apr_lib.h $(INCDIR)/apr_config.h \ $(INCDIR)/hsregex.h 1.1 apache-apr/apr/time/unix/access.c Index: access.c =================================================================== /* ==================================================================== * Copyright (c) 1999 The Apache Group. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. * * 3. All advertising materials mentioning features or use of this * software must display the following acknowledgment: * "This product includes software developed by the Apache Group * for use in the Apache HTTP server project (http://www.apache.org/)." * * 4. The names "Apache Server" and "Apache Group" must not be used to * endorse or promote products derived from this software without * prior written permission. For written permission, please contact * [EMAIL PROTECTED] * * 5. Products derived from this software may not be called "Apache" * nor may "Apache" appear in their names without prior written * permission of the Apache Group. * * 6. Redistributions of any form whatsoever must retain the following * acknowledgment: * "This product includes software developed by the Apache Group * for use in the Apache HTTP server project (http://www.apache.org/)." * * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE GROUP OR * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. * ==================================================================== * * This software consists of voluntary contributions made by many * individuals on behalf of the Apache Group. * For more information on the Apache Group and the Apache HTTP server * project, please see <http://www.apache.org/>. * */ #include "atime.h" #include "apr_time.h" #include "apr_general.h" #include "apr_lib.h" #include <errno.h> #include <string.h> ap_int64_t ap_get_curtime(ap_context_t *context, struct atime_t *time) { return time->currtime; } ap_int32_t ap_get_sec(ap_context_t *context, struct atime_t *time) { return time->explodedtime->tm_sec; } ap_int32_t ap_get_min(ap_context_t *context, struct atime_t *time) { return time->explodedtime->tm_min; } ap_int32_t ap_get_hour(ap_context_t *context, struct atime_t *time) { return time->explodedtime->tm_hour; } ap_int32_t ap_get_mday(ap_context_t *context, struct atime_t *time) { return time->explodedtime->tm_mday; } ap_int32_t ap_get_mon(ap_context_t *context, struct atime_t *time) { return time->explodedtime->tm_mon; } ap_int32_t ap_get_year(ap_context_t *context, struct atime_t *time) { return time->explodedtime->tm_year; } ap_int32_t ap_get_wday(ap_context_t *context, struct atime_t *time) { return time->explodedtime->tm_wday; } void ap_set_sec(ap_context_t *context, struct atime_t *time, ap_int32_t value) { if (time->explodedtime == NULL) { time->explodedtime = (struct tm *)ap_palloc(context->pool, sizeof(struct tm)); } time->explodedtime->tm_sec = value; } void ap_set_min(ap_context_t *context, struct atime_t *time, ap_int32_t value) { if (time->explodedtime == NULL) { time->explodedtime = (struct tm *)ap_palloc(context->pool, sizeof(struct tm)); } time->explodedtime->tm_min = value; } void ap_set_hour(ap_context_t *context, struct atime_t *time, ap_int32_t value) { if (time->explodedtime == NULL) { time->explodedtime = (struct tm *)ap_palloc(context->pool, sizeof(struct tm)); } time->explodedtime->tm_hour = value; } void ap_set_mday(ap_context_t *context, struct atime_t *time, ap_int32_t value) { if (time->explodedtime == NULL) { time->explodedtime = (struct tm *)ap_palloc(context->pool, sizeof(struct tm)); } time->explodedtime->tm_mday = value; } void ap_set_mon(ap_context_t *context, struct atime_t *time, ap_int32_t value) { if (time->explodedtime == NULL) { time->explodedtime = (struct tm *)ap_palloc(context->pool, sizeof(struct tm)); } time->explodedtime->tm_mon = value; } void ap_set_year(ap_context_t *context, struct atime_t *time, ap_int32_t value) { if (time->explodedtime == NULL) { time->explodedtime = (struct tm *)ap_palloc(context->pool, sizeof(struct tm)); } time->explodedtime->tm_year = value; } void ap_set_wday(ap_context_t *context, struct atime_t *time, ap_int32_t value) { if (time->explodedtime == NULL) { time->explodedtime = (struct tm *)ap_palloc(context->pool, sizeof(struct tm)); } time->explodedtime->tm_wday = value; } 1.1 apache-apr/apr/time/unix/atime.h Index: atime.h =================================================================== /* ==================================================================== * Copyright (c) 1999 The Apache Group. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. * * 3. All advertising materials mentioning features or use of this * software must display the following acknowledgment: * "This product includes software developed by the Apache Group * for use in the Apache HTTP server project (http://www.apache.org/)." * * 4. The names "Apache Server" and "Apache Group" must not be used to * endorse or promote products derived from this software without * prior written permission. For written permission, please contact * [EMAIL PROTECTED] * * 5. Products derived from this software may not be called "Apache" * nor may "Apache" appear in their names without prior written * permission of the Apache Group. * * 6. Redistributions of any form whatsoever must retain the following * acknowledgment: * "This product includes software developed by the Apache Group * for use in the Apache HTTP server project (http://www.apache.org/)." * * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE GROUP OR * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. * ==================================================================== * * This software consists of voluntary contributions made by many * individuals on behalf of the Apache Group. * For more information on the Apache Group and the Apache HTTP server * project, please see <http://www.apache.org/>. * */ #ifndef ATIME_H #define ATIME_H #include "apr_time.h" #include <time.h> struct atime_t { time_t currtime; struct tm *explodedtime; }; #endif /* ! ATIME_H */ 1.1 apache-apr/apr/time/unix/time.c Index: time.c =================================================================== /* ==================================================================== * Copyright (c) 1999 The Apache Group. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. * * 3. All advertising materials mentioning features or use of this * software must display the following acknowledgment: * "This product includes software developed by the Apache Group * for use in the Apache HTTP server project (http://www.apache.org/)." * * 4. The names "Apache Server" and "Apache Group" must not be used to * endorse or promote products derived from this software without * prior written permission. For written permission, please contact * [EMAIL PROTECTED] * * 5. Products derived from this software may not be called "Apache" * nor may "Apache" appear in their names without prior written * permission of the Apache Group. * * 6. Redistributions of any form whatsoever must retain the following * acknowledgment: * "This product includes software developed by the Apache Group * for use in the Apache HTTP server project (http://www.apache.org/)." * * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE GROUP OR * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. * ==================================================================== * * This software consists of voluntary contributions made by many * individuals on behalf of the Apache Group. * For more information on the Apache Group and the Apache HTTP server * project, please see <http://www.apache.org/>. * */ #include "atime.h" #include "apr_time.h" #include "apr_general.h" #include "apr_lib.h" #include <time.h> #include <errno.h> #include <string.h> struct atime_t *ap_make_time(ap_context_t *context) { struct atime_t *new; new = (struct atime_t *)ap_palloc(context->pool, sizeof(struct atime_t)); new->explodedtime = NULL; return new; } ap_status_t ap_current_time(ap_context_t *context, struct atime_t *new) { if (time(&new->currtime) == -1) { return APR_FAILURE; } return APR_SUCCESS; } ap_status_t ap_explode_time(ap_context_t *context, struct atime_t *time, ap_timetype_e type) { switch (type) { case APR_LOCALTIME: { time->explodedtime = localtime(&time->currtime); break; } case APR_UTCTIME: { time->explodedtime = gmtime(&time->currtime); break; } } return APR_SUCCESS; } ap_status_t ap_implode_time(ap_context_t *context, struct atime_t *time) { int year; time_t days; static const int dayoffset[12] = {306, 337, 0, 31, 61, 92, 122, 153, 184, 214, 245, 275}; year = time->explodedtime->tm_year; if (year < 70 || ((sizeof(time_t) <= 4) && (year >= 138))) { errno = EBAD_DATE; return APR_FAILURE; } /* shift new year to 1st March in order to make leap year calc easy */ if (time->explodedtime->tm_mon < 2) year--; /* Find number of days since 1st March 1900 (in the Gregorian calendar). */ days = year * 365 + year / 4 - year / 100 + (year / 100 + 3) / 4; days += dayoffset[time->explodedtime->tm_mon] + time->explodedtime->tm_mday - 1; days -= 25508; /* 1 jan 1970 is 25508 days since 1 mar 1900 */ days = ((days * 24 + time->explodedtime->tm_hour) * 60 + time->explodedtime->tm_min) * 60 + time->explodedtime->tm_sec; if (days < 0) { errno = EBAD_DATE; /* must have overflowed */ return APR_FAILURE; } time->currtime = days; /* must be a valid time */ return APR_SUCCESS; }