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

make the listing of queues/pipes/schedulers handle the case of

Browse Source 
data size increasing while we fetch the info.
This commit is contained in:
Luigi Rizzo 2010-03-04 16:56:36 +00:00
parent c751221af4
commit f10f583fec
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=204718
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sbin/ipfw/dummynet.c
View File

@ -1241,8 +1241,8 @@ dummynet_flush(void)
void
dummynet_list(int ac, char *av[], int show_counters)
{
struct dn_id oid, *x;
int ret, l = sizeof(oid);
struct dn_id oid, *x = NULL;
int ret, i, l = sizeof(oid);
oid_fill(&oid, l, DN_CMD_GET, DN_API_VERSION);
switch (co.do_pipe) {
@ -1256,14 +1256,29 @@ dummynet_list(int ac, char *av[], int show_counters)
oid.subtype = DN_SCH; /* list sched */
break;
}
/* Request the buffer size (in oid.id)*/
ret = do_cmd(-IP_DUMMYNET3, &oid, (uintptr_t)&l);
// printf("%s returns %d need %d\n", __FUNCTION__, ret, oid.id);
if (ret != 0 || oid.id <= sizeof(oid))
return;
l = oid.id;
x = safe_calloc(1, l);
/* Try max 10 times
* Buffer is correct if l != 0.
* If l == 0 no buffer is sent, maybe because kernel requires
* a greater buffer, so try with the new size in x->id.
*/
for (i = 0, l = oid.id; i < 10; i++, l = x->id) {
x = safe_realloc(x, l);
*x = oid;
ret = do_cmd(-IP_DUMMYNET3, x, (uintptr_t)&l);
if (ret != 0 || x->id <= sizeof(oid))
return;
if (l != 0)
break; /* ok */
}
// printf("%s returns %d need %d\n", __FUNCTION__, ret, oid.id);
// XXX filter on ac, av
list_pipes(x, O_NEXT(x, l));