d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make rctl(8) more user-friendly when RACCT/RCTL is disabled for some reason.

Browse Source 
MFC after:	1 month
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Edward Tomasz Napierala 2015-04-29 16:41:49 +00:00
parent 7c05ee19ee
commit aae2a24b49
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=282236
1 changed files with 42 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
usr.bin/rctl/rctl.c
View File

@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$");
#include <sys/types.h> #include <sys/types.h>
#include <sys/rctl.h> #include <sys/rctl.h>
#include <sys/sysctl.h>
#include <assert.h> #include <assert.h>
#include <ctype.h> #include <ctype.h>
#include <err.h> #include <err.h>
@ -304,14 +305,38 @@ print_rules(char *rules, int hflag, int nflag)
} }
} }
static void
enosys(void)
{
int error, racct_enable;
size_t racct_enable_len;
racct_enable_len = sizeof(racct_enable);
error = sysctlbyname("kern.racct.enable",
&racct_enable, &racct_enable_len, NULL, 0);
if (error != 0) {
if (errno == ENOENT)
errx(1, "RACCT/RCTL support not present in kernel; see rctl(8) for details.");
err(1, "sysctlbyname");
}
if (racct_enable == 0)
errx(1, "RACCT/RCTL present, but disabled; enable using kern.racct.enable=1 tunable");
}
static void static void
add_rule(char *rule) add_rule(char *rule)
{ {
int error; int error;
error = rctl_add_rule(rule, strlen(rule) + 1, NULL, 0); error = rctl_add_rule(rule, strlen(rule) + 1, NULL, 0);
if (error != 0) if (error != 0) {
if (errno == ENOSYS)
enosys();
err(1, "rctl_add_rule"); err(1, "rctl_add_rule");
}
free(rule); free(rule);
} }
@ -330,8 +355,11 @@ show_limits(char *filter, int hflag, int nflag)
error = rctl_get_limits(filter, strlen(filter) + 1, outbuf, error = rctl_get_limits(filter, strlen(filter) + 1, outbuf,
outbuflen); outbuflen);
if (error && errno != ERANGE) if (error && errno != ERANGE) {
if (errno == ENOSYS)
enosys();
err(1, "rctl_get_limits"); err(1, "rctl_get_limits");
}
} while (error && errno == ERANGE); } while (error && errno == ERANGE);
print_rules(outbuf, hflag, nflag); print_rules(outbuf, hflag, nflag);
@ -345,8 +373,11 @@ remove_rule(char *filter)
int error; int error;
error = rctl_remove_rule(filter, strlen(filter) + 1, NULL, 0); error = rctl_remove_rule(filter, strlen(filter) + 1, NULL, 0);
if (error != 0) if (error != 0) {
if (errno == ENOSYS)
enosys();
err(1, "rctl_remove_rule"); err(1, "rctl_remove_rule");
}
free(filter); free(filter);
} }
@ -399,8 +430,11 @@ show_usage(char *filter, int hflag)
error = rctl_get_racct(filter, strlen(filter) + 1, outbuf, error = rctl_get_racct(filter, strlen(filter) + 1, outbuf,
outbuflen); outbuflen);
if (error && errno != ERANGE) if (error && errno != ERANGE) {
if (errno == ENOSYS)
enosys();
err(1, "rctl_get_racct"); err(1, "rctl_get_racct");
}
} while (error && errno == ERANGE); } while (error && errno == ERANGE);
while ((tmp = strsep(&outbuf, ",")) != NULL) { while ((tmp = strsep(&outbuf, ",")) != NULL) {
@ -439,8 +473,11 @@ show_rules(char *filter, int hflag, int nflag)
err(1, "realloc"); err(1, "realloc");
error = rctl_get_rules(filter, filterlen, outbuf, outbuflen); error = rctl_get_rules(filter, filterlen, outbuf, outbuflen);
if (error && errno != ERANGE) if (error && errno != ERANGE) {
if (errno == ENOSYS)
enosys();
err(1, "rctl_get_rules"); err(1, "rctl_get_rules");
}
} while (error && errno == ERANGE); } while (error && errno == ERANGE);
print_rules(outbuf, hflag, nflag); print_rules(outbuf, hflag, nflag);