Home | History | Annotate | Line # | Download | only in raidframe
rf_reconmap.c revision 1.33.6.1
      1  1.33.6.1      mrg /*	$NetBSD: rf_reconmap.c,v 1.33.6.1 2012/02/24 09:11:42 mrg Exp $	*/
      2       1.1    oster /*
      3       1.1    oster  * Copyright (c) 1995 Carnegie-Mellon University.
      4       1.1    oster  * All rights reserved.
      5       1.1    oster  *
      6       1.1    oster  * Author: Mark Holland
      7       1.1    oster  *
      8       1.1    oster  * Permission to use, copy, modify and distribute this software and
      9       1.1    oster  * its documentation is hereby granted, provided that both the copyright
     10       1.1    oster  * notice and this permission notice appear in all copies of the
     11       1.1    oster  * software, derivative works or modified versions, and any portions
     12       1.1    oster  * thereof, and that both notices appear in supporting documentation.
     13       1.1    oster  *
     14       1.1    oster  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
     15       1.1    oster  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
     16       1.1    oster  * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
     17       1.1    oster  *
     18       1.1    oster  * Carnegie Mellon requests users of this software to return to
     19       1.1    oster  *
     20       1.1    oster  *  Software Distribution Coordinator  or  Software.Distribution (at) CS.CMU.EDU
     21       1.1    oster  *  School of Computer Science
     22       1.1    oster  *  Carnegie Mellon University
     23       1.1    oster  *  Pittsburgh PA 15213-3890
     24       1.1    oster  *
     25       1.1    oster  * any improvements or extensions that they make and grant Carnegie the
     26       1.1    oster  * rights to redistribute these changes.
     27       1.1    oster  */
     28       1.1    oster 
     29       1.1    oster /*************************************************************************
     30       1.1    oster  * rf_reconmap.c
     31       1.1    oster  *
     32       1.1    oster  * code to maintain a map of what sectors have/have not been reconstructed
     33       1.1    oster  *
     34       1.1    oster  *************************************************************************/
     35       1.8    lukem 
     36       1.8    lukem #include <sys/cdefs.h>
     37  1.33.6.1      mrg __KERNEL_RCSID(0, "$NetBSD: rf_reconmap.c,v 1.33.6.1 2012/02/24 09:11:42 mrg Exp $");
     38       1.1    oster 
     39       1.1    oster #include "rf_raid.h"
     40       1.1    oster #include <sys/time.h>
     41       1.1    oster #include "rf_general.h"
     42       1.1    oster #include "rf_utils.h"
     43       1.1    oster 
     44       1.1    oster /* special pointer values indicating that a reconstruction unit
     45       1.1    oster  * has been either totally reconstructed or not at all.  Both
     46       1.1    oster  * are illegal pointer values, so you have to be careful not to
     47       1.1    oster  * dereference through them.  RU_NOTHING must be zero, since
     48       1.7  thorpej  * MakeReconMap uses memset to initialize the structure.  These are used
     49       1.1    oster  * only at the head of the list.
     50       1.1    oster  */
     51       1.1    oster #define RU_ALL      ((RF_ReconMapListElem_t *) -1)
     52       1.1    oster #define RU_NOTHING  ((RF_ReconMapListElem_t *) 0)
     53       1.1    oster 
     54      1.15    oster /* For most reconstructs we need at most 3 RF_ReconMapListElem_t's.
     55      1.15    oster  * Bounding the number we need is quite difficult, as it depends on how
     56      1.15    oster  * badly the sectors to be reconstructed get divided up.  In the current
     57      1.26    perry  * code, the reconstructed sectors appeared aligned on stripe boundaries,
     58      1.26    perry  * and are always presented in stripe width units, so we're probably
     59      1.15    oster  * allocating quite a bit more than we'll ever need.
     60      1.15    oster  */
     61      1.15    oster #define RF_NUM_RECON_POOL_ELEM 100
     62      1.15    oster 
     63      1.26    perry static void
     64      1.31    oster compact_stat_entry(RF_Raid_t *, RF_ReconMap_t *, int, int);
     65      1.31    oster static void crunch_list(RF_ReconMap_t *, RF_ReconMapListElem_t *);
     66       1.4    oster static RF_ReconMapListElem_t *
     67      1.31    oster MakeReconMapListElem(RF_ReconMap_t *, RF_SectorNum_t, RF_SectorNum_t,
     68      1.31    oster 		     RF_ReconMapListElem_t *);
     69      1.26    perry static void
     70      1.15    oster FreeReconMapListElem(RF_ReconMap_t *mapPtr, RF_ReconMapListElem_t * p);
     71       1.1    oster 
     72      1.12    oster /*---------------------------------------------------------------------------
     73       1.1    oster  *
     74       1.4    oster  * Creates and initializes new Reconstruction map
     75       1.1    oster  *
     76      1.22    oster  * ru_sectors   - size of reconstruction unit in sectors
     77      1.22    oster  * disk_sectors - size of disk in sectors
     78      1.22    oster  * spareUnitsPerDisk - zero unless distributed sparing
     79      1.12    oster  *-------------------------------------------------------------------------*/
     80       1.1    oster 
     81       1.4    oster RF_ReconMap_t *
     82      1.26    perry rf_MakeReconMap(RF_Raid_t *raidPtr, RF_SectorCount_t ru_sectors,
     83      1.22    oster 		RF_SectorCount_t disk_sectors,
     84      1.22    oster 		RF_ReconUnitCount_t spareUnitsPerDisk)
     85       1.4    oster {
     86       1.4    oster 	RF_RaidLayout_t *layoutPtr = &raidPtr->Layout;
     87       1.4    oster 	RF_ReconUnitCount_t num_rus = layoutPtr->stripeUnitsPerDisk / layoutPtr->SUsPerRU;
     88       1.4    oster 	RF_ReconMap_t *p;
     89       1.4    oster 
     90       1.4    oster 	RF_Malloc(p, sizeof(RF_ReconMap_t), (RF_ReconMap_t *));
     91       1.4    oster 	p->sectorsPerReconUnit = ru_sectors;
     92       1.4    oster 	p->sectorsInDisk = disk_sectors;
     93       1.4    oster 
     94       1.4    oster 	p->totalRUs = num_rus;
     95       1.4    oster 	p->spareRUs = spareUnitsPerDisk;
     96       1.4    oster 	p->unitsLeft = num_rus - spareUnitsPerDisk;
     97      1.31    oster 	p->low_ru = 0;
     98      1.31    oster 	p->status_size = RF_RECONMAP_SIZE;
     99      1.31    oster 	p->high_ru = p->status_size - 1;
    100      1.31    oster 	p->head = 0;
    101       1.4    oster 
    102      1.31    oster 	RF_Malloc(p->status, p->status_size * sizeof(RF_ReconMapListElem_t *), (RF_ReconMapListElem_t **));
    103      1.33   plunky 	RF_ASSERT(p->status != NULL);
    104       1.4    oster 
    105       1.7  thorpej 	(void) memset((char *) p->status, 0,
    106      1.31    oster 	    p->status_size * sizeof(RF_ReconMapListElem_t *));
    107      1.26    perry 
    108      1.15    oster 	pool_init(&p->elem_pool, sizeof(RF_ReconMapListElem_t), 0,
    109      1.30       ad 	    0, 0, "raidreconpl", NULL, IPL_BIO);
    110      1.17    oster 	pool_prime(&p->elem_pool, RF_NUM_RECON_POOL_ELEM);
    111      1.15    oster 
    112      1.32      mrg 	rf_init_mutex2(p->mutex, IPL_VM);
    113      1.32      mrg 	rf_init_cond2(p->cv, "reconupdate");
    114      1.32      mrg 
    115       1.4    oster 	return (p);
    116       1.1    oster }
    117       1.1    oster 
    118       1.1    oster 
    119      1.12    oster /*---------------------------------------------------------------------------
    120       1.1    oster  *
    121      1.12    oster  * marks a new set of sectors as reconstructed.  All the possible
    122      1.12    oster  * mergings get complicated.  To simplify matters, the approach I take
    123      1.12    oster  * is to just dump something into the list, and then clean it up
    124      1.12    oster  * (i.e. merge elements and eliminate redundant ones) in a second pass
    125      1.12    oster  * over the list (compact_stat_entry()).  Not 100% efficient, since a
    126      1.12    oster  * structure can be allocated and then immediately freed, but it keeps
    127      1.12    oster  * this code from becoming (more of) a nightmare of special cases.
    128      1.12    oster  * The only thing that compact_stat_entry() assumes is that the list
    129      1.12    oster  * is sorted by startSector, and so this is the only condition I
    130      1.12    oster  * maintain here.  (MCH)
    131       1.1    oster  *
    132      1.15    oster  * This code now uses a pool instead of the previous malloc/free
    133      1.15    oster  * stuff.
    134      1.12    oster  *-------------------------------------------------------------------------*/
    135       1.1    oster 
    136      1.26    perry void
    137      1.22    oster rf_ReconMapUpdate(RF_Raid_t *raidPtr, RF_ReconMap_t *mapPtr,
    138      1.22    oster 		  RF_SectorNum_t startSector, RF_SectorNum_t stopSector)
    139       1.4    oster {
    140       1.4    oster 	RF_SectorCount_t sectorsPerReconUnit = mapPtr->sectorsPerReconUnit;
    141      1.31    oster 	RF_SectorNum_t i, first_in_RU, last_in_RU, ru;
    142       1.4    oster 	RF_ReconMapListElem_t *p, *pt;
    143       1.4    oster 
    144      1.32      mrg 	rf_lock_mutex2(mapPtr->mutex);
    145      1.24    oster 	while(mapPtr->lock) {
    146      1.32      mrg 		rf_wait_cond2(mapPtr->cv, mapPtr->mutex);
    147      1.24    oster 	}
    148      1.24    oster 	mapPtr->lock = 1;
    149      1.32      mrg 	rf_unlock_mutex2(mapPtr->mutex);
    150      1.26    perry 	RF_ASSERT(startSector >= 0 && stopSector < mapPtr->sectorsInDisk &&
    151      1.12    oster 		  stopSector >= startSector);
    152       1.4    oster 
    153       1.4    oster 	while (startSector <= stopSector) {
    154       1.4    oster 		i = startSector / mapPtr->sectorsPerReconUnit;
    155       1.4    oster 		first_in_RU = i * sectorsPerReconUnit;
    156       1.4    oster 		last_in_RU = first_in_RU + sectorsPerReconUnit - 1;
    157      1.31    oster 
    158      1.31    oster 		/* do we need to move the queue? */
    159      1.31    oster 		while (i > mapPtr->high_ru) {
    160  1.33.6.1      mrg #if 0
    161      1.31    oster #ifdef DIAGNOSTIC
    162  1.33.6.1      mrg 			/* XXX: The check below is not valid for
    163  1.33.6.1      mrg 			 * RAID5_RS.  It is valid for RAID 1 and RAID 5.
    164  1.33.6.1      mrg 			 * The issue is that we can easily have
    165  1.33.6.1      mrg 			 * RU_NOTHING entries here too, and those are
    166  1.33.6.1      mrg 			 * quite correct.
    167  1.33.6.1      mrg 			 */
    168      1.31    oster 			if (mapPtr->status[mapPtr->head]!=RU_ALL) {
    169      1.31    oster 				printf("\nraid%d: reconmap incorrect -- working on i %" PRIu64 "\n",
    170      1.31    oster 				       raidPtr->raidid, i);
    171      1.31    oster 				printf("raid%d: ru %" PRIu64 " not completed!!!\n",
    172      1.31    oster 				       raidPtr->raidid, mapPtr->head);
    173      1.31    oster 
    174      1.31    oster 				printf("raid%d: low: %" PRIu64 " high: %" PRIu64 "\n",
    175      1.31    oster 				       raidPtr->raidid, mapPtr->low_ru, mapPtr->high_ru);
    176      1.31    oster 
    177      1.31    oster 				panic("reconmap incorrect");
    178      1.31    oster 			}
    179      1.31    oster #endif
    180  1.33.6.1      mrg #endif
    181      1.31    oster 			mapPtr->low_ru++;
    182      1.31    oster 			mapPtr->high_ru++;
    183      1.31    oster 			/* initialize "highest" RU status entry, which
    184      1.31    oster 			   will take over the current head postion */
    185      1.31    oster 			mapPtr->status[mapPtr->head]=RU_NOTHING;
    186      1.31    oster 
    187      1.31    oster 			/* move head too */
    188      1.31    oster 			mapPtr->head++;
    189      1.31    oster 			if (mapPtr->head >= mapPtr->status_size)
    190      1.31    oster 				mapPtr->head = 0;
    191      1.31    oster 
    192      1.31    oster 		}
    193      1.31    oster 
    194      1.31    oster 		ru = i - mapPtr->low_ru + mapPtr->head;
    195      1.31    oster 		if (ru >= mapPtr->status_size)
    196      1.31    oster 			ru = ru - mapPtr->status_size;
    197      1.31    oster 
    198      1.31    oster 		if ((ru < 0) || (ru >= mapPtr->status_size)) {
    199      1.31    oster 			printf("raid%d: ru is bogus %" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64 "\n",
    200      1.31    oster 			       raidPtr->raidid, i, ru, mapPtr->head, mapPtr->low_ru, mapPtr->high_ru);
    201      1.31    oster 			panic("bogus ru in reconmap");
    202      1.31    oster 		}
    203      1.31    oster 
    204      1.31    oster 		p = mapPtr->status[ru];
    205       1.4    oster 		if (p != RU_ALL) {
    206      1.12    oster 			if (p == RU_NOTHING || p->startSector > startSector) {
    207      1.12    oster 				/* insert at front of list */
    208       1.4    oster 
    209      1.31    oster 				mapPtr->status[ru] = MakeReconMapListElem(mapPtr,startSector, RF_MIN(stopSector, last_in_RU), (p == RU_NOTHING) ? NULL : p);
    210       1.4    oster 
    211       1.4    oster 			} else {/* general case */
    212       1.4    oster 				do {	/* search for place to insert */
    213       1.4    oster 					pt = p;
    214       1.4    oster 					p = p->next;
    215       1.4    oster 				} while (p && (p->startSector < startSector));
    216      1.15    oster 				pt->next = MakeReconMapListElem(mapPtr,startSector, RF_MIN(stopSector, last_in_RU), p);
    217      1.14    oster 
    218       1.4    oster 			}
    219      1.31    oster 			compact_stat_entry(raidPtr, mapPtr, i, ru);
    220       1.4    oster 		}
    221       1.4    oster 		startSector = RF_MIN(stopSector, last_in_RU) + 1;
    222       1.4    oster 	}
    223      1.32      mrg 	rf_lock_mutex2(mapPtr->mutex);
    224      1.24    oster 	mapPtr->lock = 0;
    225      1.32      mrg 	rf_broadcast_cond2(mapPtr->cv);
    226      1.32      mrg 	rf_unlock_mutex2(mapPtr->mutex);
    227       1.1    oster }
    228       1.1    oster 
    229       1.1    oster 
    230       1.1    oster 
    231      1.12    oster /*---------------------------------------------------------------------------
    232       1.1    oster  *
    233       1.1    oster  * performs whatever list compactions can be done, and frees any space
    234       1.1    oster  * that is no longer necessary.  Assumes only that the list is sorted
    235      1.12    oster  * by startSector.  crunch_list() compacts a single list as much as
    236      1.12    oster  * possible, and the second block of code deletes the entire list if
    237      1.12    oster  * possible.  crunch_list() is also called from
    238      1.12    oster  * MakeReconMapAccessList().
    239       1.1    oster  *
    240       1.1    oster  * When a recon unit is detected to be fully reconstructed, we set the
    241       1.1    oster  * corresponding bit in the parity stripe map so that the head follow
    242      1.12    oster  * code will not select this parity stripe again.  This is redundant
    243      1.12    oster  * (but harmless) when compact_stat_entry is called from the
    244      1.12    oster  * reconstruction code, but necessary when called from the user-write
    245      1.12    oster  * code.
    246       1.1    oster  *
    247      1.12    oster  *-------------------------------------------------------------------------*/
    248       1.1    oster 
    249      1.26    perry static void
    250      1.31    oster compact_stat_entry(RF_Raid_t *raidPtr, RF_ReconMap_t *mapPtr, int i, int j)
    251       1.4    oster {
    252       1.4    oster 	RF_SectorCount_t sectorsPerReconUnit = mapPtr->sectorsPerReconUnit;
    253      1.31    oster 	RF_ReconMapListElem_t *p = mapPtr->status[j];
    254       1.4    oster 
    255      1.15    oster 	crunch_list(mapPtr, p);
    256       1.4    oster 
    257       1.4    oster 	if ((p->startSector == i * sectorsPerReconUnit) &&
    258      1.26    perry 	    (p->stopSector == i * sectorsPerReconUnit +
    259      1.12    oster 			      sectorsPerReconUnit - 1)) {
    260      1.31    oster 		mapPtr->status[j] = RU_ALL;
    261       1.4    oster 		mapPtr->unitsLeft--;
    262      1.15    oster 		FreeReconMapListElem(mapPtr, p);
    263       1.4    oster 	}
    264       1.4    oster }
    265       1.4    oster 
    266      1.31    oster 
    267      1.26    perry static void
    268      1.22    oster crunch_list(RF_ReconMap_t *mapPtr, RF_ReconMapListElem_t *listPtr)
    269       1.4    oster {
    270       1.4    oster 	RF_ReconMapListElem_t *pt, *p = listPtr;
    271       1.4    oster 
    272       1.4    oster 	if (!p)
    273       1.4    oster 		return;
    274       1.4    oster 	pt = p;
    275       1.4    oster 	p = p->next;
    276       1.4    oster 	while (p) {
    277       1.4    oster 		if (pt->stopSector >= p->startSector - 1) {
    278       1.4    oster 			pt->stopSector = RF_MAX(pt->stopSector, p->stopSector);
    279       1.4    oster 			pt->next = p->next;
    280      1.15    oster 			FreeReconMapListElem(mapPtr, p);
    281       1.4    oster 			p = pt->next;
    282       1.4    oster 		} else {
    283       1.4    oster 			pt = p;
    284       1.4    oster 			p = p->next;
    285       1.4    oster 		}
    286       1.4    oster 	}
    287       1.1    oster }
    288      1.12    oster /*---------------------------------------------------------------------------
    289       1.4    oster  *
    290       1.1    oster  * Allocate and fill a new list element
    291       1.1    oster  *
    292      1.12    oster  *-------------------------------------------------------------------------*/
    293       1.1    oster 
    294       1.4    oster static RF_ReconMapListElem_t *
    295      1.22    oster MakeReconMapListElem(RF_ReconMap_t *mapPtr, RF_SectorNum_t startSector,
    296      1.22    oster 		     RF_SectorNum_t stopSector, RF_ReconMapListElem_t *next)
    297       1.4    oster {
    298       1.4    oster 	RF_ReconMapListElem_t *p;
    299       1.4    oster 
    300      1.19    oster 	p = pool_get(&mapPtr->elem_pool, PR_WAITOK);
    301       1.4    oster 	p->startSector = startSector;
    302       1.4    oster 	p->stopSector = stopSector;
    303       1.4    oster 	p->next = next;
    304       1.4    oster 	return (p);
    305       1.1    oster }
    306      1.12    oster /*---------------------------------------------------------------------------
    307       1.4    oster  *
    308       1.1    oster  * Free a list element
    309       1.1    oster  *
    310      1.12    oster  *-------------------------------------------------------------------------*/
    311       1.1    oster 
    312      1.26    perry static void
    313      1.22    oster FreeReconMapListElem(RF_ReconMap_t *mapPtr, RF_ReconMapListElem_t *p)
    314       1.4    oster {
    315      1.15    oster 	pool_put(&mapPtr->elem_pool, p);
    316       1.1    oster }
    317      1.12    oster /*---------------------------------------------------------------------------
    318       1.4    oster  *
    319      1.12    oster  * Free an entire status structure.  Inefficient, but can be called at
    320      1.12    oster  * any time.
    321       1.1    oster  *
    322      1.12    oster  *-------------------------------------------------------------------------*/
    323      1.26    perry void
    324      1.22    oster rf_FreeReconMap(RF_ReconMap_t *mapPtr)
    325       1.4    oster {
    326       1.4    oster 	RF_ReconMapListElem_t *p, *q;
    327       1.4    oster 	RF_ReconUnitCount_t numRUs;
    328       1.4    oster 	RF_ReconUnitNum_t i;
    329       1.4    oster 
    330       1.4    oster 	numRUs = mapPtr->sectorsInDisk / mapPtr->sectorsPerReconUnit;
    331       1.4    oster 	if (mapPtr->sectorsInDisk % mapPtr->sectorsPerReconUnit)
    332       1.4    oster 		numRUs++;
    333       1.4    oster 
    334      1.31    oster 	for (i = 0; i < mapPtr->status_size; i++) {
    335       1.4    oster 		p = mapPtr->status[i];
    336       1.4    oster 		while (p != RU_NOTHING && p != RU_ALL) {
    337       1.4    oster 			q = p;
    338       1.4    oster 			p = p->next;
    339       1.4    oster 			RF_Free(q, sizeof(*q));
    340       1.4    oster 		}
    341       1.4    oster 	}
    342      1.31    oster 
    343      1.32      mrg 	rf_destroy_mutex2(mapPtr->mutex);
    344      1.32      mrg 	rf_destroy_cond2(mapPtr->cv);
    345      1.32      mrg 
    346      1.15    oster 	pool_destroy(&mapPtr->elem_pool);
    347      1.31    oster 	RF_Free(mapPtr->status, mapPtr->status_size *
    348      1.12    oster 		sizeof(RF_ReconMapListElem_t *));
    349       1.4    oster 	RF_Free(mapPtr, sizeof(RF_ReconMap_t));
    350       1.1    oster }
    351      1.12    oster /*---------------------------------------------------------------------------
    352       1.1    oster  *
    353       1.1    oster  * returns nonzero if the indicated RU has been reconstructed already
    354       1.1    oster  *
    355      1.12    oster  *-------------------------------------------------------------------------*/
    356       1.1    oster 
    357      1.26    perry int
    358      1.22    oster rf_CheckRUReconstructed(RF_ReconMap_t *mapPtr, RF_SectorNum_t startSector)
    359       1.1    oster {
    360       1.4    oster 	RF_ReconUnitNum_t i;
    361      1.31    oster 	int rv;
    362       1.1    oster 
    363       1.4    oster 	i = startSector / mapPtr->sectorsPerReconUnit;
    364      1.31    oster 
    365      1.31    oster 	if (i < mapPtr->low_ru)
    366      1.31    oster 		rv = 1;
    367      1.31    oster 	else if (i > mapPtr->high_ru)
    368      1.31    oster 		rv = 0;
    369      1.31    oster 	else {
    370      1.31    oster 		i = i - mapPtr->low_ru + mapPtr->head;
    371      1.31    oster 		if (i >= mapPtr->status_size)
    372      1.31    oster 			i = i - mapPtr->status_size;
    373      1.31    oster 		if (mapPtr->status[i] == RU_ALL)
    374      1.31    oster 			rv = 1;
    375      1.31    oster 		else
    376      1.31    oster 			rv = 0;
    377      1.31    oster 	}
    378      1.31    oster 
    379      1.31    oster 	return rv;
    380       1.1    oster }
    381       1.1    oster 
    382      1.26    perry RF_ReconUnitCount_t
    383      1.22    oster rf_UnitsLeftToReconstruct(RF_ReconMap_t *mapPtr)
    384       1.1    oster {
    385       1.4    oster 	RF_ASSERT(mapPtr != NULL);
    386       1.4    oster 	return (mapPtr->unitsLeft);
    387       1.4    oster }
    388       1.4    oster 
    389      1.11    oster #if RF_DEBUG_RECON
    390      1.26    perry void
    391      1.22    oster rf_PrintReconSchedule(RF_ReconMap_t *mapPtr, struct timeval *starttime)
    392       1.4    oster {
    393       1.4    oster 	static int old_pctg = -1;
    394       1.4    oster 	struct timeval tv, diff;
    395       1.4    oster 	int     new_pctg;
    396       1.4    oster 
    397      1.26    perry 	new_pctg = 100 - (rf_UnitsLeftToReconstruct(mapPtr) *
    398      1.12    oster 			  100 / mapPtr->totalRUs);
    399       1.4    oster 	if (new_pctg != old_pctg) {
    400       1.4    oster 		RF_GETTIME(tv);
    401       1.4    oster 		RF_TIMEVAL_DIFF(starttime, &tv, &diff);
    402      1.26    perry 		printf("%d %d.%06d\n", (int) new_pctg, (int) diff.tv_sec,
    403      1.12    oster 		       (int) diff.tv_usec);
    404       1.4    oster 		old_pctg = new_pctg;
    405       1.4    oster 	}
    406       1.1    oster }
    407      1.11    oster #endif
    408      1.11    oster 
    409