Skip to contentSkip to conversation

CRISv10 fasttimer: Scrap INLINE and name timeval_cmp better

PATCH In review Jesper Nilsson 2 participants 3 messages Nov 14, 2007 – Nov 15, 2007 TTY layer and serial drivers

lore
Share & tools
lore

Jesper Nilsson

author
#0 lore raw

PATCH 1/1 CRISv10 fasttimer: Scrap INLINE and name timeval_cmp better

Scrap the local __INLINE__ macro, and rename timeval_cmp to fasttime_cmp.

Inline macro was completely unnecessary since the macro was defined locally to be inline.
timeval_cmp was inaccurately named since it does comparison on struct fasttimer_t and not on struct timeval.

Signed-off-by Jesper Nilsson <[email protected]>
---
 fasttimer.c |   16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)
arch/cris/arch-v10/kernel/fasttimer.c +7 -9
index 645d705..c1a3a21 100644
@@ -46,8 +46,6 @@ static int sanity_failed;
 #define D2(x)
 #define DP(x)
 
-#define __INLINE__ inline
-
 static unsigned int fast_timer_running;
 static unsigned int fast_timers_added;
 static unsigned int fast_timers_started;

@@ -118,13 +116,13 @@ int timer_freq_settings[NUM_TIMER_STATS];
 int timer_delay_settings[NUM_TIMER_STATS];
 
 /* Not true gettimeofday, only checks the jiffies (uptime) + useconds */
-void __INLINE__ do_gettimeofday_fast(struct fasttime_t *tv)
+inline void do_gettimeofday_fast(struct fasttime_t *tv)
 {
 	tv->tv_jiff = jiffies;
 	tv->tv_usec = GET_JIFFIES_USEC();
 }
 
-int __INLINE__ timeval_cmp(struct fasttime_t *t0, struct fasttime_t *t1)
+inline int fasttime_cmp(struct fasttime_t *t0, struct fasttime_t *t1)
 {
 	/* Compare jiffies. Takes care of wrapping */
 	if (time_before(t0->tv_jiff, t1->tv_jiff))

@@ -140,7 +138,7 @@ int __INLINE__ timeval_cmp(struct fasttime_t *t0, struct fasttime_t *t1)
 	return 0;
 }
 
-void __INLINE__ start_timer1(unsigned long delay_us)
+inline void start_timer1(unsigned long delay_us)
 {
   int freq_index = 0; /* This is the lowest resolution */
   unsigned long upper_limit = MAX_DELAY_US;

@@ -264,7 +262,7 @@ void start_one_shot_timer(struct fast_timer *t,
   fast_timers_added++;
 
   /* Check if this should timeout before anything else */
-  if (tmp == NULL || timeval_cmp(&t->tv_expires, &tmp->tv_expires) < 0)
+	if (tmp == NULL || fasttime_cmp(&t->tv_expires, &tmp->tv_expires) < 0)
   {
     /* Put first in list and modify the timer value */
     t->prev = NULL;

@@ -280,8 +278,8 @@ void start_one_shot_timer(struct fast_timer *t,
     start_timer1(delay_us);
   } else {
     /* Put in correct place in list */
-    while (tmp->next &&
-           timeval_cmp(&t->tv_expires, &tmp->next->tv_expires) > 0)
+		while (tmp->next && fasttime_cmp(&t->tv_expires,
+				&tmp->next->tv_expires) > 0)
     {
       tmp = tmp->next;
     }

@@ -382,7 +380,7 @@ timer1_handler(int irq, void *dev_id)
 		D1(printk(KERN_DEBUG "t: %is %06ius\n",
 			tv.tv_jiff, tv.tv_usec));
 
-    if (timeval_cmp(&t->tv_expires, &tv) <= 0)
+		if (fasttime_cmp(&t->tv_expires, &tv) <= 0)
     {
       /* Yes it has expired */
 #ifdef FAST_TIMER_LOG

/^JN - Jesper Nilsson
--
Jesper Nilsson -- [email protected]

#1 lore raw
Quoted 26 lines · Jesper Nilsson

Scrap the local __INLINE__ macro, and rename timeval_cmp to fasttime_cmp.

Inline macro was completely unnecessary since the macro was defined locally to be inline.
timeval_cmp was inaccurately named since it does comparison on struct fasttimer_t and not on struct timeval.

Signed-off-by Jesper Nilsson <[email protected]>
---
 fasttimer.c |   16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)
(quoted diff) +0 -0

b/arch/cris/arch-v10/kernel/fasttimer.c index 645d705..c1a3a21 100644

arch/cris/arch-v10/kernel/fasttimer.c +0 -2
@@ -46,8 +46,6 @@ static int sanity_failed;
 #define D2(x)
 #define DP(x)
 
-#define __INLINE__ inline
-
 static unsigned int fast_timer_running;
 static unsigned int fast_timers_added;
 static unsigned int fast_timers_started;

arch/cris/arch-v10/kernel/fasttimer.c int timer_freq_settings[NUM_TIMER_STATS]; · line 119

Quoted 5 lines
arch/cris/arch-v10/kernel/fasttimer.c +1 -1
@@ -118,13 +116,13 @@ int timer_freq_settings[NUM_TIMER_STATS];
 int timer_delay_settings[NUM_TIMER_STATS];
 
 /* Not true gettimeofday, only checks the jiffies (uptime) + useconds */
-void __INLINE__ do_gettimeofday_fast(struct fasttime_t *tv)
+inline void do_gettimeofday_fast(struct fasttime_t *tv)

Why these functions are not "static inline"?
Wthout "static", gcc will actually create non-inlined version of them!

$ cat t.c
inline int f() { return 1; }
int g() { return f(); }
$ gcc -O2 -c t.c
$ nm --size-sort t.o
0000000a T f   <=================== !!!
0000000a T g

P.S. whitespace style in fasttimer.c doesn't match rest of the kernel (kernel uses tab, not 2-spaces indentation). Curly braces don't match too:
if (t0->tv_sec < t1->tv_sec)

  {
    return -1;
  }
should be
      if (t0->tv_sec < t1->tv_sec) {
              return -1;
      }

--
vda

author
#2 lore raw
Quoted 8 lines · Denys Vlasenko

arch/cris/arch-v10/kernel/fasttimer.c int timer_freq_settings[NUM_TIMER_STATS]; · line 119

Quoted 3 lines · Jesper Nilsson

/* Not true gettimeofday, only checks the jiffies (uptime) + useconds */

arch/cris/arch-v10/kernel/fasttimer.c +1 -1
-void __INLINE__ do_gettimeofday_fast(struct fasttime_t *tv)
+inline void do_gettimeofday_fast(struct fasttime_t *tv)

Why these functions are not "static inline"?
Wthout "static", gcc will actually create non-inlined version of them!

Quoted 7 lines
$ cat t.c
inline int f() { return 1; }
int g() { return f(); }
$ gcc -O2 -c t.c
$ nm --size-sort t.o
0000000a T f   <=================== !!!
0000000a T g

Quite true, I'll put that on the "to check" pile.

Quoted 10 lines

P.S. whitespace style in fasttimer.c doesn't match rest of the kernel (kernel uses tab, not 2-spaces indentation). Curly braces don't match too:
if (t0->tv_sec < t1->tv_sec)

  {
    return -1;
  }
should be
      if (t0->tv_sec < t1->tv_sec) {
              return -1;
      }

Yup, that item is already on my "to fix" list.

Quoted 2 lines

--
vda

Thanks for your comments!

/^JN - Jesper Nilsson
--
Jesper Nilsson -- [email protected]