Re: [PATCH] Delete kern_timestamp system call since it is not used

[Samuel Thibault]

Applied, thanks!

Flavio Cruz, le mar. 27 déc. 2022 09:06:19 -0500, a ecrit:
> ---
>  Makefrag.am       |  2 --
>  kern/lock_mon.c   |  1 -
>  kern/mach_clock.c |  7 -----
>  kern/priority.c   |  1 -
>  kern/startup.c    |  3 ---
>  kern/time_stamp.c | 61 ------------------------------------------
>  kern/time_stamp.h | 68 -----------------------------------------------
>  7 files changed, 143 deletions(-)
>  delete mode 100644 kern/time_stamp.c
>  delete mode 100644 kern/time_stamp.h
> 
> diff --git a/Makefrag.am b/Makefrag.am
> index e2593c42..2840234f 100644
> --- a/Makefrag.am
> +++ b/Makefrag.am
> @@ -216,8 +216,6 @@ libkernel_a_SOURCES += \
>       kern/thread.h \
>       kern/thread_swap.c \
>       kern/thread_swap.h \
> -     kern/time_stamp.c \
> -     kern/time_stamp.h \
>       kern/timer.c \
>       kern/timer.h \
>       kern/xpr.c \
> diff --git a/kern/lock_mon.c b/kern/lock_mon.c
> index f6bbd5dd..4b3ba82e 100644
> --- a/kern/lock_mon.c
> +++ b/kern/lock_mon.c
> @@ -45,7 +45,6 @@
>  #include <mach/boolean.h>
>  #include <kern/thread.h>
>  #include <kern/lock.h>
> -#include <kern/time_stamp.h>
>  
>  
>  decl_simple_lock_data(extern , kdb_lock)
> diff --git a/kern/mach_clock.c b/kern/mach_clock.c
> index 6f964f73..c6e54c20 100644
> --- a/kern/mach_clock.c
> +++ b/kern/mach_clock.c
> @@ -52,7 +52,6 @@
>  #include <kern/sched.h>
>  #include <kern/sched_prim.h>
>  #include <kern/thread.h>
> -#include <kern/time_stamp.h>
>  #include <kern/timer.h>
>  #include <kern/priority.h>
>  #include <vm/vm_kern.h>
> @@ -206,12 +205,6 @@ void clock_interrupt(
>           timer_elt_t telt;
>           boolean_t   needsoft = FALSE;
>  
> -#if  TS_FORMAT == 1
> -         /*
> -          *  Increment the tick count for the timestamping routine.
> -          */
> -         ts_tick_count++;
> -#endif       /* TS_FORMAT == 1 */
>  
>           /*
>            *  Update the tick count since bootup, and handle
> diff --git a/kern/priority.c b/kern/priority.c
> index 3dba0c80..fe11d0d4 100644
> --- a/kern/priority.c
> +++ b/kern/priority.c
> @@ -45,7 +45,6 @@
>  #include <kern/priority.h>
>  #include <kern/processor.h>
>  #include <kern/timer.h>
> -#include <kern/time_stamp.h>
>  #include <machine/machspl.h>
>  
>  
> diff --git a/kern/startup.c b/kern/startup.c
> index 1f873192..bf63ec0e 100644
> --- a/kern/startup.c
> +++ b/kern/startup.c
> @@ -49,7 +49,6 @@
>  #include <kern/timer.h>
>  #include <kern/xpr.h>
>  #include <kern/bootstrap.h>
> -#include <kern/time_stamp.h>
>  #include <kern/startup.h>
>  #include <vm/vm_kern.h>
>  #include <vm/vm_map.h>
> @@ -131,8 +130,6 @@ void setup_main(void)
>       xprbootstrap();
>  #endif       /* XPR_DEBUG */
>  
> -     timestamp_init();
> -
>       machine_init();
>  
>       mapable_time_init();
> diff --git a/kern/time_stamp.c b/kern/time_stamp.c
> deleted file mode 100644
> index b8ac9d82..00000000
> --- a/kern/time_stamp.c
> +++ /dev/null
> @@ -1,61 +0,0 @@
> -/*
> - * Mach Operating System
> - * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
> - * All Rights Reserved.
> - *
> - * Permission to use, copy, modify and distribute this software and its
> - * documentation is hereby granted, provided that both the copyright
> - * notice and this permission notice appear in all copies of the
> - * software, derivative works or modified versions, and any portions
> - * thereof, and that both notices appear in supporting documentation.
> - *
> - * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
> - * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
> - * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
> - *
> - * Carnegie Mellon requests users of this software to return to
> - *
> - *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
> - *  School of Computer Science
> - *  Carnegie Mellon University
> - *  Pittsburgh PA 15213-3890
> - *
> - * any improvements or extensions that they make and grant Carnegie Mellon
> - * the rights to redistribute these changes.
> - */
> -
> -#include <mach/std_types.h>
> -#include <machine/locore.h>
> -#include <sys/time.h>
> -#include <kern/time_stamp.h>
> -
> -unsigned     ts_tick_count;
> -
> -/*
> - *   ts.c - kern_timestamp system call.
> - */
> -kern_return_t
> -kern_timestamp(struct tsval *tsp)
> -{
> -/*
> -     temp.low_val = 0;
> -     temp.high_val = ts_tick_count;
> -*/
> -     time_value_t temp;
> -     temp = time;
> -
> -     if (copyout(&temp,
> -                 tsp,
> -                 sizeof(struct tsval)) != KERN_SUCCESS)
> -         return(KERN_INVALID_ADDRESS);
> -     return(KERN_SUCCESS);
> -}
> -
> -/*
> - *   Initialization procedure.
> - */
> -
> -void timestamp_init(void)
> -{
> -     ts_tick_count = 0;
> -}
> diff --git a/kern/time_stamp.h b/kern/time_stamp.h
> deleted file mode 100644
> index 2492e522..00000000
> --- a/kern/time_stamp.h
> +++ /dev/null
> @@ -1,68 +0,0 @@
> -/*
> - * Mach Operating System
> - * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
> - * All Rights Reserved.
> - *
> - * Permission to use, copy, modify and distribute this software and its
> - * documentation is hereby granted, provided that both the copyright
> - * notice and this permission notice appear in all copies of the
> - * software, derivative works or modified versions, and any portions
> - * thereof, and that both notices appear in supporting documentation.
> - *
> - * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
> - * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
> - * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
> - *
> - * Carnegie Mellon requests users of this software to return to
> - *
> - *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
> - *  School of Computer Science
> - *  Carnegie Mellon University
> - *  Pittsburgh PA 15213-3890
> - *
> - * any improvements or extensions that they make and grant Carnegie Mellon
> - * the rights to redistribute these changes.
> - */
> -
> -#ifndef      _KERN_TIME_STAMP_H_
> -#define _KERN_TIME_STAMP_H_
> -
> -#include <machine/time_stamp.h>
> -/*
> - *   time_stamp.h -- definitions for low-overhead timestamps.
> - */
> -
> -struct tsval {
> -     unsigned        low_val;        /* least significant word */
> -     unsigned        high_val;       /* most significant word */
> -};
> -
> -/*
> - *   Format definitions.
> - */
> -
> -#ifndef      TS_FORMAT
> -/*
> - *   Default case - Just return a tick count for machines that
> - *   don't support or haven't implemented this.  Assume 100Hz ticks.
> - *
> - *   low_val - Always 0.
> - *   high_val - tick count.
> - */
> -#define      TS_FORMAT       1
> -
> -#if  KERNEL
> -extern unsigned      ts_tick_count;
> -#endif       /* KERNEL */
> -#endif       /* TS_FORMAT */
> -
> -/*
> - *   List of all format definitions for convert_ts_to_tv.
> - */
> -
> -#define      TS_FORMAT_DEFAULT       1
> -#define TS_FORMAT_MMAX               2
> -
> -extern void timestamp_init(void);
> -
> -#endif       /* _KERN_TIME_STAMP_H_ */
> -- 
> 2.37.2
> 
> 

-- 
Samuel
---
Pour une évaluation indépendante, transparente et rigoureuse !
Je soutiens la Commission d'Évaluation de l'Inria.