[Orca-checkins] r280 - in trunk/orca: data_gatherers/orcallator patches

[Blair Zajac]

Author: blair
Date: Fri Jan 30 20:39:36 2004
New Revision: 280

Added:
   trunk/orca/patches/kstat.se-fjge-interface-patch.txt
   trunk/orca/patches/netif.se-fjge-interface-patch.txt
Modified:
   trunk/orca/data_gatherers/orcallator/orcallator.cfg.in
Log:
Add Orca and SE support for Fujitsu fjge Gigabit interfaces on
Solaris.  Patches from Richard Grevis at ubs.com <Richard.Grevis at ubs.com>.

* data_gatherers/orcallator/orcallator.cfg.in:
  Add a match on fjge\d+ in the 1 Gbit interface plots.

* patches/kstat.se-fjge-interface-patch.txt:
  New file that patches SE's kstat.se.  Patch made against kstat.se
  from SE 3.3.1.

* patches/netif.se-fjge-interface-patch.txt: 
  New file that patches SE's netif.se.  Patch made against netif.se
  from SE 3.3.1.


Modified: trunk/orca/data_gatherers/orcallator/orcallator.cfg.in
==============================================================================
--- trunk/orca/data_gatherers/orcallator/orcallator.cfg.in	(original)
+++ trunk/orca/data_gatherers/orcallator/orcallator.cfg.in	Fri Jan 30 20:39:36 2004
@@ -351,7 +351,7 @@
 plot {
 title			%g Interface Bits Per Second: $1
 source			orcallator
-data			1024 * 8 * ((?:(?:ce)|(?:v?ge)|(?:skge))\d+)InKB/s
+data			1024 * 8 * ((?:(?:ce)|(?:fjge)|(?:v?ge)|(?:skge))\d+)InKB/s
 data			1024 * 8 * $1OuKB/s
 line_type		area
 line_type		line1

Added: trunk/orca/patches/kstat.se-fjge-interface-patch.txt
==============================================================================
--- (empty file)
+++ trunk/orca/patches/kstat.se-fjge-interface-patch.txt	Fri Jan 30 20:39:36 2004
@@ -0,0 +1,51 @@
+--- kstat.se-3.3.1	2003-08-14 19:11:22.000000000 -0700
++++ kstat.se	2004-01-30 20:26:37.000000000 -0800
+@@ -1679,6 +1679,48 @@
+     uint32_t collisions;
+ };
+ 
++// Fujitsu Gigabit ethernet card
++// Richard Grevis 5/nov/03
++
++kstat struct "fjge:" ks_fjge_network {
++    int    number$;        // linear counter
++    string name$;          // name of interface
++    int    instance$;      // instance number
++
++    uint32_t ipackets;
++    uint32_t ierrors;
++    uint32_t opackets;
++    uint32_t oerrors;
++    uint32_t collisions;
++    uint32_t obytes;
++    uint32_t rbytes;
++    uint32_t multixmt;
++    uint32_t multircv;
++    uint32_t brdcstxmt;
++    uint32_t brdcstrcv;
++    uint64_t blocked;
++    uint32_t noxmtbuf;
++    uint32_t norcvbuf;
++    uint64_t nocanput;
++    uint64_t xmtretry;
++    uint64_t intr;
++    uint64_t nocarrier;
++    uint64_t defer;
++    uint64_t framing;
++    uint64_t crc;
++    uint64_t oflo;
++    uint64_t uflo;
++    uint64_t missed;
++    uint64_t rxtoolong;
++    uint64_t inrangeerr;
++    uint64_t late_collisions;
++    uint64_t SYM_short;
++    uint64_t excollisions;
++    uint32_t ifspeed;
++    uint64_t conmode;
++    uint32_t fjge_log1;
++};
++
+ kstat struct "ge:" ks_ge_network {
+     int    number$;        // linear counter
+     string name$;          // name of interface

Added: trunk/orca/patches/netif.se-fjge-interface-patch.txt
==============================================================================
--- (empty file)
+++ trunk/orca/patches/netif.se-fjge-interface-patch.txt	Fri Jan 30 20:39:36 2004
@@ -0,0 +1,57 @@
+--- netif.se-3.3.1	2003-08-14 19:11:22.000000000 -0700
++++ netif.se	2004-01-30 20:26:37.000000000 -0800
+@@ -44,7 +44,8 @@
+ #define NETIF_ERI   24
+ #define NETIF_CE    25
+ #define NETIF_AFE   26
+-#define NETIF_TYPES 27
++#define NETIF_FJGE  27
++#define NETIF_TYPES 28
+ 
+ // possible values for ifspeed (may also be ifspeed from kstat)
+ #define TEN_MEGABIT       10000000
+@@ -114,6 +115,7 @@
+     ks_eri_network  if_eri;   // new blade interface
+     ks_ce_network   if_ce;    // SunSwift 10/100/1000
+     ks_afe_network  if_afe;   // Another Fast Ethernet (Linksys LNE100TX 4.1)
++    ks_fjge_network if_fjge;  // Fujitsu gigabit ethernet
+ 
+     if (initialized == 0) {
+       count = -1;
+@@ -252,6 +254,11 @@
+         count++;
+       }
+       if_max[NETIF_AFE] = count;
++      for(refresh$(if_fjge); if_fjge.number$ != -1;
++          if_fjge.number$++, refresh$(if_fjge)) {
++        count++;
++      }
++      if_max[NETIF_FJGE] = count;
+ 
+       if_count = count + 1;
+       initialized = 1;
+@@ -737,6 +744,24 @@
+       ifspeed        = if_afe.ifspeed;
+       iftype         = NT_CSMACD;
+       break;
++
++    case NETIF_FJGE:	/* Added by Richard Grevis */
++      if_fjge.number$ = number$ - (if_max[NETIF_AFE] + 1);
++      refresh$(if_fjge);
++      name$          = if_fjge.name$;
++      ipackets       = if_fjge.ipackets;
++      ierrors        = if_fjge.ierrors;
++      opackets       = if_fjge.opackets;
++      oerrors        = if_fjge.oerrors;
++      collisions     = if_fjge.collisions;
++      nocanput       = if_fjge.nocanput;
++      defer          = if_fjge.noxmtbuf;
++      nocarrier      = if_fjge.nocarrier;
++      ooctets        = if_fjge.obytes;
++      ioctets        = if_fjge.rbytes;
++      ifspeed        = if_fjge.ifspeed;
++      iftype         = NT_CSMACD;
++      break;
+     }
+     if (opackets != 0) {
+       collision_rate = (collisions * 100.0) / opackets;