Use click_jiffies_t where appropriate.

That is, not click_jiffies_type. Also fix a misbehavior in click_get_cycles() for i386 without 64-bit integers.
tbarbette · May 23, 2008 · 0d9f144 · 0d9f144
1 parent a4afeda
commit 0d9f144
Show file tree

Hide file tree

Showing 16 changed files with 48 additions and 47 deletions.
diff --git a/elements/aqm/red.cc b/elements/aqm/red.cc
@@ -207,9 +207,9 @@ RED::should_drop()
     } else {
 	// do timing stuff for when the queue was empty
 #if CLICK_HZ < 50
-	int j = click_jiffies();
+	click_jiffies_t j = click_jiffies();
 #else
-	int j = click_jiffies() / (CLICK_HZ / 50);
+	click_jiffies_t j = click_jiffies() / (CLICK_HZ / 50);
 #endif
 	_size.update_n(0, _last_jiffies ? j - _last_jiffies : 1);
 	_last_jiffies = j;

diff --git a/elements/aqm/red.hh b/elements/aqm/red.hh
@@ -150,7 +150,7 @@ class RED : public Element { public:
     unsigned _G2;
     int _count;
     int _random_value;
-    int _last_jiffies;
+    click_jiffies_t _last_jiffies;
 
     int _drops;
     Vector<Element *> _queue_elements;

diff --git a/elements/bsdmodule/fastudpsrc.hh b/elements/bsdmodule/fastudpsrc.hh
@@ -71,8 +71,8 @@ class FastUDPSource : public Element {
   unsigned int _interval;
   bool _cksum;
   struct mbuf *_m;
-  unsigned long _first; // jiffies
-  unsigned long _last;
+  click_jiffies_t _first;
+  click_jiffies_t _last;
 
   void incr_ports();
 
@@ -101,8 +101,8 @@ class FastUDPSource : public Element {
   void add_handlers();
   void reset();
   unsigned count() { return _count; }
-  unsigned long first() { return _first; }
-  unsigned long last() { return _last; }
+  click_jiffies_t first() { return _first; }
+  click_jiffies_t last() { return _last; }
 
 #if 0
   friend int FastUDPSource_limit_write_handler 

diff --git a/elements/ethernet/arpquerier.cc b/elements/ethernet/arpquerier.cc
@@ -167,7 +167,7 @@ ARPQuerier::expire_hook(Timer *timer, void *thunk)
     // packet.
     ARPQuerier *arpq = (ARPQuerier *)thunk;
     arpq->_lock.acquire_write();
-    int jiff = click_jiffies();
+    click_jiffies_t jiff = click_jiffies();
     ARPEntry *ae;
 
     // Delete old entries.
@@ -364,7 +364,7 @@ ARPQuerier::handle_ip(Packet *p)
     }
 
     // Send a query for any given address at most 10 times a second.
-    click_jiffies_type jiff = click_jiffies();
+    click_jiffies_t jiff = click_jiffies();
     if ((jiff - ae->last_response_jiffies) >= CLICK_HZ / 10) {
 	ae->last_response_jiffies = jiff;
 	_lock.release_write();

diff --git a/elements/ethernet/arpquerier.hh b/elements/ethernet/arpquerier.hh
@@ -142,7 +142,7 @@ class ARPQuerier : public Element { public:
 	EtherAddress en;	// Deleting head and pprev could get it down to
 	bool ok;		// 32B, with some time cost.
 	bool polling;		// It used to be 24B... :|
-	int last_response_jiffies;
+	click_jiffies_t last_response_jiffies;
 	Packet *head;
 	Packet *tail;
 	ARPEntry *next;

diff --git a/elements/ethernet/ip6ndsolicitor.cc b/elements/ethernet/ip6ndsolicitor.cc
@@ -92,7 +92,7 @@ void
 IP6NDSolicitor::expire_hook(Timer *, void *thunk)
 {
   IP6NDSolicitor *arpq = (IP6NDSolicitor *)thunk;
-  int jiff = click_jiffies();
+  click_jiffies_t jiff = click_jiffies();
   for (int i = 0; i < NMAP; i++) {
     NDEntry *prev = 0;
     while (1) {

diff --git a/elements/ethernet/ip6ndsolicitor.hh b/elements/ethernet/ip6ndsolicitor.hh
@@ -75,7 +75,7 @@ class IP6NDSolicitor : public Element {
    struct NDEntry {
     IP6Address ip6;
     EtherAddress en;
-    int last_response_jiffies;
+    click_jiffies_t last_response_jiffies;
     unsigned ok: 1;
     unsigned polling: 1;
     Packet *p;

diff --git a/elements/linuxmodule/fasttcpflows.hh b/elements/linuxmodule/fasttcpflows.hh
@@ -69,8 +69,8 @@ class FastTCPFlows : public Element {
   unsigned int _last_flow;
   unsigned int _flowsize;
   bool _cksum;
-  unsigned long _first; // jiffies
-  unsigned long _last;
+  click_jiffies_t _first;
+  click_jiffies_t _last;
 
   struct flow_t {
     WritablePacket *syn_packet;
@@ -106,8 +106,8 @@ class FastTCPFlows : public Element {
   void add_handlers();
   void reset();
   unsigned count() { return _count; }
-  unsigned long first() { return _first; }
-  unsigned long last() { return _last; }
+  click_jiffies_t first() { return _first; }
+  click_jiffies_t last() { return _last; }
 };
 
 

diff --git a/elements/linuxmodule/fastudpflows.hh b/elements/linuxmodule/fastudpflows.hh
@@ -66,8 +66,8 @@ class FastUDPFlows : public Element {
   unsigned int _last_flow;
   unsigned int _flowsize;
   bool _cksum;
-  unsigned long _first; // jiffies
-  unsigned long _last;
+  click_jiffies_t _first;
+  click_jiffies_t _last;
 
   struct flow_t {
     WritablePacket *packet;
@@ -102,8 +102,8 @@ class FastUDPFlows : public Element {
   void add_handlers();
   void reset();
   unsigned count() { return _count; }
-  unsigned long first() { return _first; }
-  unsigned long last() { return _last; }
+  click_jiffies_t first() { return _first; }
+  click_jiffies_t last() { return _last; }
 };
 
 

diff --git a/elements/linuxmodule/fastudpsrc.hh b/elements/linuxmodule/fastudpsrc.hh
@@ -71,8 +71,8 @@ class FastUDPSource : public Element {
   bool _cksum;
   WritablePacket *_packet;
   struct sk_buff *_skb;
-  unsigned long _first; // jiffies
-  unsigned long _last;
+  click_jiffies_t _first;
+  click_jiffies_t _last;
 
   void incr_ports();
 
@@ -100,8 +100,8 @@ class FastUDPSource : public Element {
   void add_handlers();
   void reset();
   unsigned count() { return _count; }
-  unsigned long first() { return _first; }
-  unsigned long last() { return _last; }
+  click_jiffies_t first() { return _first; }
+  click_jiffies_t last() { return _last; }
 
 #if 0
   friend int FastUDPSource_limit_write_handler 

diff --git a/elements/linuxmodule/fastudpsrcip6.hh b/elements/linuxmodule/fastudpsrcip6.hh
@@ -72,8 +72,8 @@ class FastUDPSourceIP6 : public Element {
   bool _cksum;
   WritablePacket *_packet;
   struct sk_buff *_skb;
-  unsigned long _first; // jiffies
-  unsigned long _last;
+  click_jiffies_t _first;
+  click_jiffies_t _last;
 
   void incr_ports();
 
@@ -101,8 +101,8 @@ class FastUDPSourceIP6 : public Element {
   void add_handlers();
   void reset();
   unsigned count() { return _count; }
-  unsigned long first() { return _first; }
-  unsigned long last() { return _last; }
+  click_jiffies_t first() { return _first; }
+  click_jiffies_t last() { return _last; }
 
 #if 0
   friend int FastUDPSourceIP6_limit_write_handler 

diff --git a/elements/linuxmodule/sortedsched.cc b/elements/linuxmodule/sortedsched.cc
@@ -215,7 +215,7 @@ BalancedThreadSched::run_timer(Timer *)
 #if DEBUG > 1
     if (high >= 500) {
 	print = 1;
-	unsigned now = click_jiffies();
+	click_jiffies_t now = click_jiffies();
 	for(int i=0; i<sorted.size(); i++) {
 	    Element *e = sorted[i]->element();
 	    if (e)
@@ -254,7 +254,7 @@ BalancedThreadSched::run_timer(Timer *)
 
 #if DEBUG > 1
     if (print) {
-	unsigned now = click_jiffies();
+	click_jiffies_t now = click_jiffies();
 	for(int i=0; i<sorted.size(); i++) {
 	    Element *e = sorted[i]->element();
 	    if (e) 

diff --git a/elements/linuxmodule/threadmonitor.cc b/elements/linuxmodule/threadmonitor.cc
@@ -60,7 +60,7 @@ ThreadMonitor::run_timer(Timer *)
 {
     Master *m = router()->master();
     StringAccum sa;
-    unsigned now_jiffies = click_jiffies();
+    click_jiffies_t now_jiffies = click_jiffies();
 
     // report currently scheduled tasks (ignore pending list)
     for (int tid = 0; tid < m->nthreads(); tid++) {

diff --git a/elements/standard/averagecounter.cc b/elements/standard/averagecounter.cc
@@ -63,13 +63,14 @@ AverageCounter::initialize(ErrorHandler *)
 Packet *
 AverageCounter::simple_action(Packet *p)
 {
-  _first.compare_and_swap(0, click_jiffies());
-  if (click_jiffies() - _first >= _ignore) {
-    _count++;
-    _byte_count += p->length();
-  }
-  _last = click_jiffies();
-  return p;
+    uint32_t jpart = click_jiffies();
+    _first.compare_and_swap(0, jpart);
+    if (jpart - _first >= _ignore) {
+	_count++;
+	_byte_count += p->length();
+    }
+    _last = jpart;
+    return p;
 }
 
 static String

diff --git a/include/click/glue.hh b/include/click/glue.hh
@@ -209,27 +209,27 @@ typedef struct device net_device;
 // TIMEVALS AND JIFFIES
 
 #if CLICK_LINUXMODULE
-typedef unsigned long click_jiffies_type;
-typedef long click_jiffies_difference_type;
+typedef unsigned long click_jiffies_t;
+typedef long click_jiffies_difference_t;
 # define click_gettimeofday(tvp)	(do_gettimeofday(tvp))
 # define click_jiffies()		(jiffies)
 # define CLICK_HZ			HZ
 #elif CLICK_BSDMODULE
-typedef int click_jiffies_type;
-typedef int click_jiffies_difference_type;
+typedef int click_jiffies_t;
+typedef int click_jiffies_difference_t;
 # define click_gettimeofday(tvp)	(getmicrotime(tvp))
 # define click_jiffies()		((unsigned)ticks)
 # define CLICK_HZ			hz
 #else
-typedef unsigned click_jiffies_type;
-typedef int click_jiffies_difference_type;
+typedef unsigned click_jiffies_t;
+typedef int click_jiffies_difference_t;
 #if !CLICK_NS
 # define click_gettimeofday(tvp)	(gettimeofday(tvp, (struct timezone *)0))
 #else
 # define click_gettimeofday(tvp)	(simclick_gettimeofday(tvp))
 #endif
 CLICK_DECLS
-click_jiffies_type click_jiffies();
+click_jiffies_t click_jiffies();
 CLICK_ENDDECLS
 # define CLICK_HZ			1000
 #endif
@@ -412,7 +412,7 @@ click_get_cycles()
 #elif CLICK_LINUXMODULE && __i386__
     uint32_t xlo, xhi;
     __asm__ __volatile__ ("rdtsc" : "=a" (xlo), "=d" (xhi));
-    return xhi ? 0xFFFFFFFF : xlo;
+    return xlo;
 #elif CLICK_BSDMODULE
     return rdtsc();
 #else

diff --git a/lib/glue.cc b/lib/glue.cc
@@ -569,7 +569,7 @@ click_qsort(void *base, size_t n, size_t size, int (*compar)(const void *, const
 # endif
 CLICK_DECLS
 
-click_jiffies_type
+click_jiffies_t
 click_jiffies()
 {
     struct timeval tv;