From: Sami Kerola <kerolasa@iki.fi>
To: util-linux@vger.kernel.org
Cc: kerolasa@iki.fi
Subject: [PATCH 05/15] cytune: kernel still does not have send_count in cyclades_monitor structure
Date: Sun, 4 May 2014 16:49:46 +0100 [thread overview]
Message-ID: <1399218596-21321-6-git-send-email-kerolasa@iki.fi> (raw)
In-Reply-To: <1399218596-21321-1-git-send-email-kerolasa@iki.fi>
It is unlikely the information about sent data will ever appear to kernel
interface, so stop waiting it.
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
sys-utils/cytune.c | 34 +---------------------------------
1 file changed, 1 insertion(+), 33 deletions(-)
diff --git a/sys-utils/cytune.c b/sys-utils/cytune.c
index 995a75f..7ca39c7 100644
--- a/sys-utils/cytune.c
+++ b/sys-utils/cytune.c
@@ -55,26 +55,14 @@
#include "closestream.h"
#include "strutils.h"
-#if 0
-# ifndef XMIT
-# include <linux/version.h>
-# if LINUX_VERSION_CODE > 66056
-# define XMIT
-# endif
-# endif
-#endif
-
#include "xalloc.h"
#include "nls.h"
-/* Until it gets put in the kernel, toggle by hand. */
-#undef XMIT
struct cyclades_control {
struct cyclades_monitor c;
int cfile;
int maxmax;
double maxtran;
- double maxxmit;
unsigned long threshold_value;
unsigned long timeout_value;
};
@@ -159,9 +147,6 @@ static void query_tty_stats(int argc, char **argv, unsigned int interval, int nu
int i;
double diff;
double xfer_rate;
-#ifdef XMIT
- double xmit_rate;
-#endif
cmon = xmalloc(sizeof(struct cyclades_control) * numfiles);
@@ -214,9 +199,6 @@ static void query_tty_stats(int argc, char **argv, unsigned int interval, int nu
_("cannot get timeout for %s"), argv[i]);
xfer_rate = cywork.char_count / diff;
-#ifdef XMIT
- xmit_rate = cywork.send_count / diff;
-#endif
if ((*threshold_value) !=
cmon[cmon_index].threshold_value
|| (*timeout_value) !=
@@ -232,10 +214,6 @@ static void query_tty_stats(int argc, char **argv, unsigned int interval, int nu
/* Don't record this first cycle after change */
if (xfer_rate > cmon[cmon_index].maxtran)
cmon[cmon_index].maxtran = xfer_rate;
-#ifdef XMIT
- if (xmit_rate > cmon[cmon_index].maxxmit)
- cmon[cmon_index].maxxmit = xmit_rate;
-#endif
if (cmon[cmon_index].maxmax < 0 ||
cywork.char_max >
(unsigned long)cmon[cmon_index].maxmax)
@@ -243,16 +221,6 @@ static void query_tty_stats(int argc, char **argv, unsigned int interval, int nu
cywork.char_max;
}
-#ifdef XMIT
- printf(_("%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, "
- "%lu max, %lu now\n"), argv[i],
- cywork.int_count, cywork.char_count,
- cywork.send_count, *threshold_value,
- *timeout_value, cywork.char_max,
- cywork.char_last);
- printf(_(" %f int/sec; %f rec, %f send (char/sec)\n"),
- cywork.int_count / diff, xfer_rate, xmit_rate);
-#else
printf(_("%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, "
"%lu max, %lu now\n"), argv[i],
cywork.int_count, cywork.char_count,
@@ -260,7 +228,7 @@ static void query_tty_stats(int argc, char **argv, unsigned int interval, int nu
cywork.char_last);
printf(_(" %f int/sec; %f rec (char/sec)\n"),
cywork.int_count / diff, xfer_rate);
-#endif
+
memcpy(&cmon[cmon_index].c, &cywork,
sizeof(struct cyclades_monitor));
}
--
1.9.2
next prev parent reply other threads:[~2014-05-04 15:50 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-04 15:49 [PATCH 00/15] cytune modernization Sami Kerola
2014-05-04 15:49 ` [PATCH 01/15] cytune: rename threshold and timeout variables Sami Kerola
2014-05-05 8:34 ` Benno Schulenberg
2014-05-04 15:49 ` [PATCH 02/15] cytune: remove unnecessary variables Sami Kerola
2014-05-05 8:29 ` Benno Schulenberg
2014-05-04 15:49 ` [PATCH 03/15] cytune: be consistent with interval data type Sami Kerola
2014-05-04 15:49 ` [PATCH 04/15] cytune: use single loop for setting and getting ioctl() calls Sami Kerola
2014-05-05 8:24 ` Benno Schulenberg
2014-05-04 15:49 ` Sami Kerola [this message]
2014-05-04 15:49 ` [PATCH 06/15] cytune: prefer sigaction(), and remove unnecessary abstractions Sami Kerola
2014-05-04 15:49 ` [PATCH 07/15] cytune: add cyg_get_mon() to avoid duplicate code Sami Kerola
2014-05-04 15:49 ` [PATCH 08/15] cytune: add structure to hold run time configuration Sami Kerola
2014-05-04 15:49 ` [PATCH 09/15] cytune: pull signal handling and statistic priting apart Sami Kerola
2014-05-04 15:49 ` [PATCH 10/15] cytune: remove unnecessary type casts Sami Kerola
2014-05-04 15:49 ` [PATCH 11/15] cytune: deprecate undescriptive options Sami Kerola
2014-05-04 15:49 ` [PATCH 12/15] cytune: add filename to struct cyclades_control Sami Kerola
2014-05-04 15:49 ` [PATCH 13/15] cytune: add noreturn function attributes Sami Kerola
2014-05-04 15:49 ` [PATCH 14/15] cytune: use matching type in struct cyclades_control with kernel Sami Kerola
2014-05-04 15:49 ` [PATCH 15/15] cytune: update copyright Sami Kerola
2014-05-07 7:10 ` [PATCH 00/15] cytune modernization Karel Zak
2014-05-07 8:12 ` Sami Kerola
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1399218596-21321-6-git-send-email-kerolasa@iki.fi \
--to=kerolasa@iki.fi \
--cc=util-linux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox