mirror of
https://github.com/EnergyMech/energymech.git
synced 2025-12-17 15:36:50 +00:00
calc and hostinfo progress
This commit is contained in:
joonicks
parent
e00dc6c57b
commit
4b614a4b82
75
src/calc.c
75
src/calc.c
@ -1,7 +1,7 @@
|
||||
/*
|
||||
|
||||
EnergyMech, IRC bot software
|
||||
Copyright (c) 2020-2021 proton
|
||||
Copyright (c) 2020-2024 proton
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@ -92,7 +92,9 @@ const char *calculate(const char *input, CalcOp *cop, char *prepin)
|
||||
*dst = 0;
|
||||
input = prepin;
|
||||
|
||||
#ifdef TEST
|
||||
printf("%s\n",prepin);
|
||||
#endif /* TEST */
|
||||
cop_count = 0;
|
||||
maxdeci = 0;
|
||||
goto new_blank;
|
||||
@ -140,14 +142,21 @@ op_or_num:
|
||||
input++;
|
||||
goto parse_num;
|
||||
}
|
||||
if (*input >= '0' && *input <= '9')
|
||||
if (*input == '*')
|
||||
{
|
||||
op = OPER_MUL;
|
||||
input++;
|
||||
para++;
|
||||
goto parse_num;
|
||||
}
|
||||
if ((*input >= '0' && *input <= '9') || *input == '.')
|
||||
goto parse_num;
|
||||
if (*input == 0)
|
||||
goto new_op_or_num;
|
||||
goto parsing_error;
|
||||
|
||||
parse_num:
|
||||
if (*input == '-' || *input == '+')
|
||||
if (*input == '-' || *input == '+' || *input == '*')
|
||||
{
|
||||
goto new_op_or_num;
|
||||
}
|
||||
@ -176,7 +185,7 @@ parsing_error:
|
||||
calculate_result:
|
||||
x = 20;
|
||||
/* find most decimals and convert all other numbers */
|
||||
for(i=0;i<=cop_count;i++)
|
||||
/* for(i=0;i<=cop_count;i++)
|
||||
{
|
||||
if (cop[i].decimals < maxdeci)
|
||||
{
|
||||
@ -188,6 +197,7 @@ calculate_result:
|
||||
cop[i].decimals = maxdeci;
|
||||
}
|
||||
}
|
||||
*/
|
||||
r = 0;
|
||||
iterate:
|
||||
/* find highest paralevel */
|
||||
@ -195,7 +205,8 @@ iterate:
|
||||
for(i=0;i<=cop_count;i++)
|
||||
{
|
||||
if (cop[i].paralevel >= 0)
|
||||
printf("number %lli, operation %i, decimals %i, paralevel %i\n",cop[i].number,cop[i].operation,cop[i].decimals,cop[i].paralevel);
|
||||
printf("number %lu, operation %i, decimals %i, paralevel %i\n",
|
||||
cop[i].number,cop[i].operation,cop[i].decimals,cop[i].paralevel);
|
||||
if (cop[i].paralevel >= para)
|
||||
para = cop[i].paralevel;
|
||||
}
|
||||
@ -210,6 +221,18 @@ iterate:
|
||||
r += cop[i].number;
|
||||
cop[i].paralevel = -1;
|
||||
}
|
||||
if (cop[i].paralevel == para && op == 2 && cop[i].operation == OPER_MUL)
|
||||
{
|
||||
cop[i-1].number = cop[i-1].number * cop[i].number;
|
||||
/* if (cop[i-1].decimals > cop[i].decimals)*/
|
||||
{
|
||||
#ifdef TEST
|
||||
printf("decimals adjust %i > %i\n",cop[i-1].decimals,cop[i].decimals);
|
||||
#endif /* TEST */
|
||||
/* cop[i-1].number /= decival[cop[i-1].decimals - cop[i].decimals];*/
|
||||
}
|
||||
cop[i].paralevel = -1;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (x--<0)
|
||||
@ -232,21 +255,6 @@ return_result:
|
||||
return(prepin);
|
||||
}
|
||||
|
||||
void do_calc(COMMAND_ARGS)
|
||||
{
|
||||
CalcOp cop[MAX_COP];
|
||||
int cp = 0;
|
||||
|
||||
memset(&cop,0,sizeof(cop));
|
||||
|
||||
/* start with a numeral, or '-' */
|
||||
if (*rest != '-' && (attrtab[(uchar)*rest] & NUM) == 0)
|
||||
{
|
||||
/* malformed */
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
void mkbin(char *dst, int num, int bits)
|
||||
{
|
||||
int lim;
|
||||
@ -317,6 +325,23 @@ int bas2int(const char *src, int base)
|
||||
|
||||
#if !defined(TEST)
|
||||
|
||||
void do_calc(COMMAND_ARGS)
|
||||
{
|
||||
char prep[MSGLEN];
|
||||
CalcOp cop[MAX_COP];
|
||||
int cp = 0;
|
||||
|
||||
memset(&cop,0,sizeof(cop));
|
||||
|
||||
/* start with a numeral, or '.', or '-' */
|
||||
if (*rest != '-' && *rest != '.' && (attrtab[(uchar)*rest] & NUM) == 0)
|
||||
{
|
||||
/* malformed */
|
||||
return;
|
||||
}
|
||||
to_user_q(from,"%s",calculate(rest,cop,prep));
|
||||
}
|
||||
|
||||
void do_convert(COMMAND_ARGS)
|
||||
{
|
||||
char output[200];
|
||||
@ -416,7 +441,7 @@ void do_convert(COMMAND_ARGS)
|
||||
if (dst != output)
|
||||
*(dst++) = ' ';
|
||||
|
||||
sprintf(dst,"oct 0%o",num,num);
|
||||
sprintf(dst,"oct 0%o",num);
|
||||
}
|
||||
|
||||
if (tohex)
|
||||
@ -461,8 +486,11 @@ void do_convert(COMMAND_ARGS)
|
||||
const char *test[] = {
|
||||
"1 - .2 + .03 - .004",
|
||||
"2.008 + 9 + .992",
|
||||
/* "999 - 555.66",
|
||||
"1+2-3+4-5+6-7+8-9",*/
|
||||
"999 - 555.66",
|
||||
"1+2-3+4-5+6-7+8-9",
|
||||
"100*200",
|
||||
"10-10*10+10",
|
||||
".001*1000",
|
||||
NULL
|
||||
};
|
||||
|
||||
@ -470,7 +498,6 @@ int main(int argc, char **argv, char **envp)
|
||||
{
|
||||
char prep[MSGLEN];
|
||||
CalcOp cop[MAX_COP];
|
||||
char *tmp;
|
||||
int i;
|
||||
|
||||
for(i=0;test[i];i++)
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/*
|
||||
|
||||
EnergyMech, IRC bot software
|
||||
Copyright (c) 2020 proton
|
||||
Copyright (c) 2020-2024 proton
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@ -141,7 +141,7 @@ int parse_proc_status(char *line)
|
||||
|
||||
key = chop(&line);
|
||||
#ifdef DEBUG
|
||||
debug("pps key = %s (%s)\n",key,line);
|
||||
debug("(parse_proc_status) pps key = %s (%s)\n",key,line);
|
||||
#endif
|
||||
if (key == NULL)
|
||||
return(FALSE);
|
||||
@ -267,7 +267,7 @@ void process_monitor()
|
||||
FileMon *fmon;
|
||||
struct inotify_event *ivent;
|
||||
char tmp[256];
|
||||
int n;
|
||||
int n,m;
|
||||
|
||||
for(fmon=filemonlist;fmon;fmon=fmon->next)
|
||||
{
|
||||
@ -277,14 +277,14 @@ void process_monitor()
|
||||
|
||||
n = read(fmon->fd,globaldata,sizeof(struct inotify_event));
|
||||
if (ivent->len > 0)
|
||||
read(fmon->fd,ivent->name,ivent->len);
|
||||
m = read(fmon->fd,ivent->name,ivent->len);
|
||||
else
|
||||
*ivent->name = 0;
|
||||
#ifdef DEBUG
|
||||
debug("ino %i, n %i, sz %i\n",fmon->fd,n,sizeof(in2str));
|
||||
debug("wd %i, mask %lu, cookie %lu, len %lu, name %s\n",
|
||||
debug("(process_monitor) ino %i, n %i, sz %i\n",fmon->fd,n,sizeof(in2str));
|
||||
debug("(process_monitor) wd %i, mask %lu, cookie %lu, len %lu, name %s\n",
|
||||
ivent->wd,ivent->mask,ivent->cookie,ivent->len,ivent->name);
|
||||
debug("%s\n",inomask2str(ivent->mask,tmp));
|
||||
debug("(process_monitor) %s\n",inomask2str(ivent->mask,tmp));
|
||||
debug("(process_monitor) ino %i bytes read, int wd = %i, uint32_t mask = %s (%lu), "
|
||||
"uint32_t cookie = %lu, uint32_t len = %lu, char name = %s\n",
|
||||
n,ivent->wd,inomask2str(ivent->mask,tmp),ivent->mask,ivent->cookie,ivent->len,ivent->name);
|
||||
@ -302,13 +302,13 @@ void process_monitor()
|
||||
/*---------------------------------------------------------------------------------------------------------------------------------------------------*/
|
||||
|
||||
/*
|
||||
help:HOSTINFO:(no arguments)
|
||||
help:SYSINFO:(no arguments)
|
||||
|
||||
Equivalent to ``uname -orm''
|
||||
|
||||
See also: meminfo, cpuinfo
|
||||
*/
|
||||
void do_hostinfo(COMMAND_ARGS)
|
||||
void do_sysinfo(COMMAND_ARGS)
|
||||
{
|
||||
char *h,hostname[256];
|
||||
struct utsname un;
|
||||
@ -363,7 +363,7 @@ See also: hostinfo, meminfo
|
||||
*/
|
||||
void do_cpuinfo(COMMAND_ARGS)
|
||||
{
|
||||
char bogostr[64],cpustr[64];
|
||||
char bogostr[256],cpustr[64];
|
||||
char *a1,*a2,*a3,*dst;
|
||||
int fd,n;
|
||||
double loads[3];
|
||||
@ -375,13 +375,6 @@ void do_cpuinfo(COMMAND_ARGS)
|
||||
else
|
||||
stringcpy(bogostr,"/proc/cpuinfo");
|
||||
if ((fd = open(bogostr,O_RDONLY)) < 0)
|
||||
/*
|
||||
if ((fd = open("/home/git/cpuinfo/mips3",O_RDONLY)) < 0)
|
||||
if ((fd = open("/home/git/cpuinfo/mips2",O_RDONLY)) < 0)
|
||||
if ((fd = open("/home/git/cpuinfo/mips1",O_RDONLY)) < 0)
|
||||
if ((fd = open("/home/git/cpuinfo/intel1",O_RDONLY)) < 0)
|
||||
if ((fd = open("/home/git/cpuinfo/cosmiccow",O_RDONLY)) < 0)
|
||||
*/
|
||||
#endif
|
||||
if ((fd = open("/proc/cpuinfo",O_RDONLY)) < 0)
|
||||
#ifdef DEBUG
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user