[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[hurd] 02/06: devnode: convert to trivfs dynamic classes and buckets
From: |
Samuel Thibault |
Subject: |
[hurd] 02/06: devnode: convert to trivfs dynamic classes and buckets |
Date: |
Tue, 13 Oct 2015 00:09:52 +0000 |
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch dde
in repository hurd.
commit bf2bad0a2a98ac983240c6ca8bb205f6b7e937ee
Author: Justus Winter <address@hidden>
Date: Mon Sep 28 15:22:29 2015 +0200
devnode: 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.
* devnode/devnode.c: Convert to dynamic classes and buckets.
---
devnode/devnode.c | 27 +++++++++++++--------------
1 file changed, 13 insertions(+), 14 deletions(-)
diff --git a/devnode/devnode.c b/devnode/devnode.c
index f9f0359..6ec8a65 100644
--- a/devnode/devnode.c
+++ b/devnode/devnode.c
@@ -73,10 +73,9 @@ 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;
+/* Our port classes. */
+struct port_class *trivfs_protid_class;
+struct port_class *trivfs_cntl_class;
static int
devnode_demuxer (mach_msg_header_t *inp,
@@ -270,18 +269,18 @@ 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 (trivfs_protid_portclasses[0]);
+ count = ports_count_class (trivfs_protid_class);
debug ("the number of ports alive: %d\n", count);
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;
}
@@ -326,8 +325,8 @@ main (int argc, char *argv[])
const struct argp argp = { options, parse_opt, args_doc, doc };
port_bucket = ports_create_bucket ();
- 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);
@@ -344,8 +343,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 <=
- [hurd] 03/06: eth-filter: convert to trivfs dynamic classes and buckets, Samuel Thibault, 2015/10/12
- [hurd] 06/06: Merge branch 'dde-upstream' into dde, Samuel Thibault, 2015/10/15