diff options
| author | Thorsten Lockert <tholo@cvs.openbsd.org> | 2004-06-24 19:35:28 +0000 |
|---|---|---|
| committer | Thorsten Lockert <tholo@cvs.openbsd.org> | 2004-06-24 19:35:28 +0000 |
| commit | c6cc17e855e1d9fe177fba41d00de6e89fdc852e (patch) | |
| tree | bdc6bde04c820ca59fe49d60185cf6ac40b44e30 /sys/ufs/ffs/ffs_softdep.c | |
| parent | 128dd71ffeec48b94e085c757b3626553d619e7c (diff) | |
This moves access to wall and uptime variables in MI code,
encapsulating all such access into wall-defined functions
that makes sure locking is done as needed.
It also cleans up some uses of wall time vs. uptime some
places, but there is sure to be more of these needed as
well, particularily in MD code. Also, many current calls
to microtime() should probably be changed to getmicrotime(),
or to the {,get}microuptime() versions.
ok art@ deraadt@ aaron@ matthieu@ beck@ sturm@ millert@ others
"Oh, that is not your problem!" from miod@
Diffstat (limited to 'sys/ufs/ffs/ffs_softdep.c')
| -rw-r--r-- | sys/ufs/ffs/ffs_softdep.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c index 4d692bc24c8..9c82db74e9c 100644 --- a/sys/ufs/ffs/ffs_softdep.c +++ b/sys/ufs/ffs/ffs_softdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs_softdep.c,v 1.50 2004/05/07 01:40:16 tedu Exp $ */ +/* $OpenBSD: ffs_softdep.c,v 1.51 2004/06/24 19:35:26 tholo Exp $ */ /* * Copyright 1998, 2000 Marshall Kirk McKusick. All Rights Reserved. * @@ -656,7 +656,7 @@ softdep_process_worklist(matchmnt) wakeup_one(&proc_waiting); } loopcount = 1; - starttime = time; + getmicrouptime(&starttime); while (num_on_worklist > 0) { matchcnt += process_worklist_item(matchmnt, 0); @@ -697,8 +697,10 @@ softdep_process_worklist(matchmnt) */ { struct timeval diff; + struct timeval tv; - timersub(&time, &starttime, &diff); + getmicrouptime(&tv); + timersub(&tv, &starttime, &diff); if (diff.tv_sec != 0 && matchmnt == NULL) { matchcnt = -1; break; |