Return to stats.h CVS log

Up to [local] / src / usr.bin / make

Mostly clean-up:
- cut up those huge include files into separate interfaces for all modules.
Put the interface documentation there, and not with the implementation.
- light-weight includes for needed concrete types (lst_t.h, timestamp_t.h).
- cut out some more logically separate parts: cmd_exec, varname, parsevar,
timestamp.
- put all error handling functions together, so that we will be able to
clean them up.
- more systematic naming: functioni  to handle interval, function to handle
string.
- put the init/end code apart to minimize coupling.
- kill weird types like ReturnStatus and Boolean. Use standard bool (with a
fallback for non-iso systems)
- better interface documentation for lots of subsystems.

As a result, make compilation goes somewhat faster (5%, even considering
the largish BSD copyrights to read). The corresponding preprocessed
source goes down from 1,5M to 1M.

A few minor code changes as well: Parse_DoVar is no longer destructive.
Parse_IsVar functionality is folded into Parse_DoVar (as it knows what an
assignment is), a few more interval handling functions. Avoid calling
XXX_End when they do nothing, just #define XXX_End   to nothing.

Parse_DoVar is slightly more general: it will handle compound assignments
as long as they make sense, e.g., VAR +!= cmd
will work.  As a side effect, VAR++=value now triggers an error
(two + in assignment).
- this stuff doesn't occur in portable Makefiles.
- writing VAR++ = value or VAR+ +=value  disambiguates it.
- this is a good thing, it uncovered a bug in bsd.port.mk.

Tested by naddy@. Okayed millert@. I'll handle the fallback if there is
any. This went through a full make build anyways, including isakmpd
(without mickey's custom binutils, as he didn't see fit to share it with me).

#ifndef STAT_H
#define STAT_H
/* $OpenPackages$ */
/* $OpenBSD: stats.h,v 1.2 2001/05/23 12:34:49 espie Exp $ */

/*
 * Copyright (c) 1999 Marc Espie.
 *
 * Code written for the OpenBSD project.
 *
 * 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.
 *
 * THIS SOFTWARE IS PROVIDED BY THE OPENBSD PROJECT AND CONTRIBUTORS
 * ``AS IS'' AND ANY EXPRESS 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 OPENBSD
 * PROJECT OR 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.
 */

/* statistical information gathering */

#if defined(STATS_VAR_LOOKUP) || \
	defined(STATS_GN_CREATION) || \
	defined(STATS_BUF) || \
	defined(STATS_HASH)
#define HAS_STATS
#endif

#ifdef HAS_STATS
extern void Init_Stats(void);

extern unsigned long *statarray;
#define STAT_INVOCATIONS	 statarray[0]
#define STAT_VAR_SEARCHES	 statarray[1]
#define STAT_VAR_COUNT		 statarray[2]
#define STAT_VAR_MAXCOUNT	 statarray[3]
#define STAT_GN_COUNT		 statarray[4]
#define STAT_TOTAL_BUFS 	 statarray[5]
#define STAT_DEFAULT_BUFS	 statarray[6]
#define STAT_WEIRD_BUFS 	 statarray[7]
#define STAT_BUFS_EXPANSION	 statarray[8]
#define STAT_WEIRD_INEFFICIENT	 statarray[9]
#define STAT_VAR_HASH_CREATION	statarray[10]
#define STAT_VAR_FROM_ENV	statarray[11]
#define STAT_VAR_CREATION	statarray[12]
#define STAT_VAR_FIND		statarray[13]
#define STAT_HASH_CREATION	statarray[14]
#define STAT_HASH_ENTRIES	statarray[15]
#define STAT_HASH_EXPAND	statarray[16]
#define STAT_HASH_LOOKUP	statarray[17]
#define STAT_HASH_LENGTH	statarray[18]
#define STAT_HASH_SIZE		statarray[19]
#define STAT_HASH_POSITIVE	statarray[20]
#define STAT_USER_SECONDS	statarray[21]
#define STAT_USER_MS		statarray[22]
#define STAT_SYS_SECONDS	statarray[23]
#define STAT_SYS_MS		statarray[24]
#define STAT_VAR_HASH_MAXSIZE	statarray[25]
#define STAT_VAR_GHASH_MAXSIZE	statarray[26]
#define STAT_VAR_POWER		statarray[27]

#define STAT_NUMBER		30

#else
#define Init_Stats()
#endif

#endif