[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[hurd] 03/06: eth-filter: convert to trivfs dynamic classes and buckets
From: |
Samuel Thibault |
Subject: |
[hurd] 03/06: eth-filter: convert to trivfs dynamic classes and buckets |
Date: |
Tue, 13 Oct 2015 00:09:53 +0000 |
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch dde
in repository hurd.
commit a29d8283c74c29d1b1ad978bd054c8171a465a98
Author: Justus Winter <address@hidden>
Date: Mon Sep 28 15:23:31 2015 +0200
eth-filter: convert to trivfs dynamic classes and buckets
libtrivfs contains two ways of managing more than one port class and
bucket. There is the old way of using a statically allocated array
with explicit length, and the new way with dynamically allocated
vectors.
Converting all users to the new way of handling multiple classes
and/or buckets, we can simplify the code in libtrivfs. In many cases,
the code will be simpler and more expressive for the user.
This also fixes a mild bug. The classes and buckets given to
`trivfs_startup' end up in the dynamic vectors too, making the object
lookup code use the more complicated code path.
* eth-filter/filter.c: Convert to dynamic classes and buckets.
---
eth-filter/filter.c | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/eth-filter/filter.c b/eth-filter/filter.c
index 13dd03b..74a1e86 100644
--- a/eth-filter/filter.c
+++ b/eth-filter/filter.c
@@ -125,11 +125,6 @@ int trivfs_support_write = 0;
int trivfs_support_exec = 0;
int trivfs_allow_open = O_READ | O_WRITE;
-struct port_class *trivfs_protid_portclasses[1];
-struct port_class *trivfs_cntl_portclasses[1];
-int trivfs_protid_nportclasses = 1;
-int trivfs_cntl_nportclasses = 1;
-
/* For getting the notification of ports from the kernel. */
struct port_info *notify_pi;
@@ -194,6 +189,10 @@ clean_proxy_device (void *p)
device->proxy->device = NULL;
}
+/* Our port classes. */
+struct port_class *trivfs_protid_class;
+struct port_class *trivfs_cntl_class;
+
int
ethernet_demuxer (mach_msg_header_t *inp,
mach_msg_header_t *outp)
@@ -206,7 +205,8 @@ ethernet_demuxer (mach_msg_header_t *inp,
if (inp->msgh_id != NET_RCV_MSG_ID)
return 0;
- device = ports_lookup_port (port_bucket, inp->msgh_local_port,
device_portclass);
+ device = ports_lookup_port (port_bucket, inp->msgh_local_port,
+ device_portclass);
if (device == NULL)
return 0;
proxy = device->proxy;
@@ -561,8 +561,8 @@ trivfs_goaway (struct trivfs_control *fsys, int flags)
int count;
/* Stop new requests. */
- ports_inhibit_class_rpcs (trivfs_cntl_portclasses[0]);
- ports_inhibit_class_rpcs (trivfs_protid_portclasses[0]);
+ ports_inhibit_class_rpcs (trivfs_cntl_class);
+ ports_inhibit_class_rpcs (trivfs_protid_class);
count = ports_count_class (user_portclass);
debug ("the number of ports alive: %d\n", count);
@@ -570,9 +570,9 @@ trivfs_goaway (struct trivfs_control *fsys, int flags)
if (count && !(flags & FSYS_GOAWAY_FORCE))
{
/* We won't go away, so start things going again... */
- ports_enable_class (trivfs_protid_portclasses[0]);
- ports_resume_class_rpcs (trivfs_cntl_portclasses[0]);
- ports_resume_class_rpcs (trivfs_protid_portclasses[0]);
+ ports_enable_class (trivfs_protid_class);
+ ports_resume_class_rpcs (trivfs_cntl_class);
+ ports_resume_class_rpcs (trivfs_protid_class);
return EBUSY;
}
@@ -757,8 +757,8 @@ main (int argc, char *argv[])
user_portclass = ports_create_class (clean_proxy_user, 0);
device_portclass = ports_create_class (clean_proxy_device, 0);
other_portclass = ports_create_class (0, 0);
- trivfs_cntl_portclasses[0] = ports_create_class (trivfs_clean_cntl, 0);
- trivfs_protid_portclasses[0] = ports_create_class (trivfs_clean_protid, 0);
+ trivfs_cntl_class = ports_create_class (trivfs_clean_cntl, 0);
+ trivfs_protid_class = ports_create_class (trivfs_clean_protid, 0);
argp_parse (&argp, argc, argv, 0, 0, 0);
@@ -785,8 +785,8 @@ main (int argc, char *argv[])
/* Reply to our parent. */
err = trivfs_startup (bootstrap, 0,
- trivfs_cntl_portclasses[0], port_bucket,
- trivfs_protid_portclasses[0], port_bucket, &fsys);
+ trivfs_cntl_class, port_bucket,
+ trivfs_protid_class, port_bucket, &fsys);
mach_port_deallocate (mach_task_self (), bootstrap);
if (err)
error (1, err, "Contacting parent");
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-hurd/hurd.git
- [hurd] branch dde updated (8e94601 -> c7fdc30), Samuel Thibault, 2015/10/12
- [hurd] 01/06: libddekit: fix cache line size, Samuel Thibault, 2015/10/12
- [hurd] 04/06: libmachdev: convert to trivfs dynamic classes and buckets, Samuel Thibault, 2015/10/12
- [hurd] 05/06: Merge remote-tracking branch 'incubator/dde' into dde-upstream, Samuel Thibault, 2015/10/12
- [hurd] 02/06: devnode: convert to trivfs dynamic classes and buckets, Samuel Thibault, 2015/10/12
- [hurd] 03/06: eth-filter: convert to trivfs dynamic classes and buckets,
Samuel Thibault <=
- [hurd] 06/06: Merge branch 'dde-upstream' into dde, Samuel Thibault, 2015/10/15