565e35e50e
o Shuffle things that live at the datalink level into ``show link'' rather than ``show modem''. o Make both ``show'' commands prettier and more consistent, and display carrier status, link type and our name in ``show modem''. o Show redial and reconnect information in ``show link'' and remove ``show redial'' and ``show reconnect''. o Down the correct link in bundle_LinkLost(). o Remove stale -direct and -background links at the end of our main loop, not when we know they're going. This prevents unexpected pointer-invalidations... o If we ``set server'' with the same values twice, notice and don't moan about failure. o Record dial script despite our link mode. The mode may be changed later (next mod) :-) We never run scripts in -direct and -dedicated modes. o Make ``set server none'' functional again. o Correct datalink state array so that we don't report an ``unknown'' state. o Pass struct ipcp to IpcpCleanInterface, not struct fsm. o Create TUN_PREFIX define rather than hard-coding in main.c o prompt_TtyInit now handles a NULL prompt for -direct mode rather than having to create one then destroy it uncleanly. o Mention our mode in the "PPP Started" LogPHASE message. o Bring all auto links up when we have something to send. o Remove some redundant Physical_*() functions. o Show which connection is running a command when logging commands. o Initialise throughput uptime correctly.
156 lines
4.6 KiB
C
156 lines
4.6 KiB
C
/*-
|
|
* Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* $Id: throughput.c,v 1.4.4.5 1998/04/07 00:54:21 brian Exp $
|
|
*/
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <stdio.h>
|
|
#include <termios.h>
|
|
#include <time.h>
|
|
|
|
#include "log.h"
|
|
#include "timer.h"
|
|
#include "throughput.h"
|
|
#include "vars.h"
|
|
#include "descriptor.h"
|
|
#include "prompt.h"
|
|
|
|
void
|
|
throughput_init(struct pppThroughput *t)
|
|
{
|
|
int f;
|
|
|
|
t->OctetsIn = t->OctetsOut = 0;
|
|
for (f = 0; f < SAMPLE_PERIOD; f++)
|
|
t->SampleOctets[f] = 0;
|
|
t->OctetsPerSecond = t->BestOctetsPerSecond = t->nSample = 0;
|
|
t->Timer.name = "throughput";
|
|
t->uptime = 0;
|
|
throughput_stop(t);
|
|
}
|
|
|
|
void
|
|
throughput_disp(struct pppThroughput *t, struct prompt *prompt)
|
|
{
|
|
int secs_up;
|
|
|
|
secs_up = t->uptime ? time(NULL) - t->uptime : 0;
|
|
prompt_Printf(prompt, "Connect time: %d secs\n", secs_up);
|
|
if (secs_up == 0)
|
|
secs_up = 1;
|
|
prompt_Printf(prompt, "%ld octets in, %ld octets out\n",
|
|
t->OctetsIn, t->OctetsOut);
|
|
if (Enabled(ConfThroughput)) {
|
|
prompt_Printf(prompt, " overall %5ld bytes/sec\n",
|
|
(t->OctetsIn+t->OctetsOut)/secs_up);
|
|
prompt_Printf(prompt, " currently %5d bytes/sec\n", t->OctetsPerSecond);
|
|
prompt_Printf(prompt, " peak %5d bytes/sec\n",
|
|
t->BestOctetsPerSecond);
|
|
} else
|
|
prompt_Printf(prompt, "Overall %ld bytes/sec\n",
|
|
(t->OctetsIn+t->OctetsOut)/secs_up);
|
|
}
|
|
|
|
|
|
void
|
|
throughput_log(struct pppThroughput *t, int level, const char *title)
|
|
{
|
|
if (t->uptime) {
|
|
int secs_up;
|
|
|
|
secs_up = t->uptime ? time(NULL) - t->uptime : 0;
|
|
if (title)
|
|
LogPrintf(level, "%s: Connect time: %d secs: %ld octets in, %ld octets"
|
|
" out\n", title, secs_up, t->OctetsIn, t->OctetsOut);
|
|
else
|
|
LogPrintf(level, "Connect time: %d secs: %ld octets in, %ld octets out\n",
|
|
secs_up, t->OctetsIn, t->OctetsOut);
|
|
if (secs_up == 0)
|
|
secs_up = 1;
|
|
if (Enabled(ConfThroughput))
|
|
LogPrintf(level, " total %ld bytes/sec, peak %d bytes/sec\n",
|
|
(t->OctetsIn+t->OctetsOut)/secs_up, t->BestOctetsPerSecond);
|
|
else
|
|
LogPrintf(level, " total %ld bytes/sec\n",
|
|
(t->OctetsIn+t->OctetsOut)/secs_up);
|
|
}
|
|
}
|
|
|
|
static void
|
|
throughput_sampler(void *v)
|
|
{
|
|
struct pppThroughput *t = (struct pppThroughput *)v;
|
|
u_long old;
|
|
|
|
StopTimer(&t->Timer);
|
|
t->Timer.state = TIMER_STOPPED;
|
|
|
|
old = t->SampleOctets[t->nSample];
|
|
t->SampleOctets[t->nSample] = t->OctetsIn + t->OctetsOut;
|
|
t->OctetsPerSecond = (t->SampleOctets[t->nSample] - old) / SAMPLE_PERIOD;
|
|
if (t->BestOctetsPerSecond < t->OctetsPerSecond)
|
|
t->BestOctetsPerSecond = t->OctetsPerSecond;
|
|
if (++t->nSample == SAMPLE_PERIOD)
|
|
t->nSample = 0;
|
|
|
|
StartTimer(&t->Timer);
|
|
}
|
|
|
|
void
|
|
throughput_start(struct pppThroughput *t, const char *name)
|
|
{
|
|
throughput_init(t);
|
|
time(&t->uptime);
|
|
if (Enabled(ConfThroughput)) {
|
|
t->Timer.state = TIMER_STOPPED;
|
|
t->Timer.load = SECTICKS;
|
|
t->Timer.func = throughput_sampler;
|
|
t->Timer.name = name;
|
|
t->Timer.arg = t;
|
|
StartTimer(&t->Timer);
|
|
}
|
|
}
|
|
|
|
void
|
|
throughput_stop(struct pppThroughput *t)
|
|
{
|
|
if (Enabled(ConfThroughput))
|
|
StopTimer(&t->Timer);
|
|
}
|
|
|
|
void
|
|
throughput_addin(struct pppThroughput *t, int n)
|
|
{
|
|
t->OctetsIn += n;
|
|
}
|
|
|
|
void
|
|
throughput_addout(struct pppThroughput *t, int n)
|
|
{
|
|
t->OctetsOut += n;
|
|
}
|