Page MenuHomeFreeBSD
Differential D25117

Add pthread_getname_np() and pthread_setname_np() aliases for pthread_get_name_np() and pthread_set_name_np().
ClosedPublic
Actions

Authored by kib on Jun 3 2020, 3:51 PM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Apr 14, 2:09 AM
Unknown Object (File)
Mon, Apr 7, 4:43 AM
Unknown Object (File)
Mar 6 2025, 6:58 AM
Unknown Object (File)
Mar 5 2025, 2:06 AM
Unknown Object (File)
Feb 28 2025, 3:50 PM
Unknown Object (File)
Feb 28 2025, 3:24 PM
Unknown Object (File)
Feb 28 2025, 3:24 PM
Unknown Object (File)
Feb 28 2025, 3:24 PM
View All Files
Subscribers
arrowd
imp
yuripv
zeising

Details

Reviewers
markj
jkim
antoine
Commits
rS362032: Add pthread_getname_np() and pthread_setname_np() aliases for
rS361770: Add pthread_getname_np() and pthread_setname_np() aliases
Summary

To be compatible with Linux.

PR: 238404

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Skipped
Unit
Tests Skipped
Build Status
Buildable 31486

Event Timeline

kib created this revision.Jun 3 2020, 3:51 PM
Herald added a subscriber: imp. · View Herald TranscriptJun 3 2020, 3:51 PM
kib requested review of this revision.Jun 3 2020, 3:51 PM
Harbormaster completed remote builds in B31461: Diff 72616.Jun 3 2020, 3:51 PM
markj added a comment.Jun 3 2020, 4:10 PM

Thanks, I started doing this too but you are faster.

lib/libthr/pthread.map
250

_pthread_get_name_np is not in the private namespace. Should it be there? Should we also provide non-weak _pthread_(get|set)name_np symbols?

share/man/man3/pthread_set_name_np.3
98–103

The new functions should be mentioned here too. It might be useful to note that getname/setname are "more" compatible with other OS'.

markj added inline comments.Jun 3 2020, 4:18 PM
share/man/man3/Makefile
497

Missing backslash.

kib marked 2 inline comments as done.Jun 3 2020, 4:59 PM
kib added inline comments.
lib/libthr/pthread.map
250

I do not think we should export anything from the private namespace until there are users of it in the base system.

Also we prefer to export non-ANSI-C symbols as weak (but this is not a hard rule). Our weak symbols have a semantic beyond what is required by ELF standard, rtld prefers non-weak over weak regardless of the lookup order.

kib updated this revision to Diff 72625.Jun 3 2020, 4:59 PM

Fix Makefile.
Update man page portability section.

Harbormaster completed remote builds in B31466: Diff 72625.Jun 3 2020, 4:59 PM
markj accepted this revision.Jun 3 2020, 5:11 PM
This revision is now accepted and ready to land.Jun 3 2020, 5:11 PM
Closed by commit rS361770: Add pthread_getname_np() and pthread_setname_np() aliases (authored by kib). · Explain WhyJun 3 2020, 8:54 PM
This revision was automatically updated to reflect the committed changes.
kib added a commit: rS361770: Add pthread_getname_np() and pthread_setname_np() aliases.
kib reopened this revision.Jun 4 2020, 11:55 AM
kib updated this revision to Diff 72659.

Make functions more compatible with Linux:
return errors
put declarations into pthread.h undef BSD_VISIBLE.

Harbormaster completed remote builds in B31480: Diff 72659.Jun 4 2020, 11:56 AM
kib added reviewers: jkim, antoine.Jun 4 2020, 11:56 AM
jkim added inline comments.Jun 4 2020, 2:20 PM
lib/libthr/thread/thr_info.c
48–49

Duplicate. Typo?

markj added inline comments.Jun 4 2020, 3:01 PM
include/pthread.h
306

The indentation is inconsistent.

lib/libthr/thread/thr_info.c
90

This can fail with ENOMEM.

yuripv added a subscriber: yuripv.Jun 4 2020, 5:10 PM
yuripv added inline comments.
share/man/man3/pthread_set_name_np.3
53

apply

62

retrieve

85

Insert .Pp after .El to make this more readable.

kib marked 3 inline comments as done.Jun 4 2020, 5:18 PM
kib added inline comments.
lib/libthr/thread/thr_info.c
90

I know it, I do not consider the case important, syscall would fail anyway for too long string, and this is the only case that really matters.

But I fixed it anyway.

kib updated this revision to Diff 72669.Jun 4 2020, 5:20 PM
kib marked 4 inline comments as done.

Fix exports aliases.
Handle NULL from strdup().
Minor man page/style etc issues.

Harbormaster completed remote builds in B31486: Diff 72669.Jun 4 2020, 5:22 PM
zeising added a subscriber: zeising.Jun 4 2020, 7:47 PM
markj accepted this revision.Jun 4 2020, 7:53 PM
This revision is now accepted and ready to land.Jun 4 2020, 7:53 PM
jkim accepted this revision.Jun 4 2020, 9:38 PM

LGTM.

arrowd added a subscriber: arrowd.Jun 6 2020, 5:50 PM

Some Haskell ports are now failing with

ld-elf.so.1: /usr/local/bin/cabal: Undefined symbol "pthread_setname_np@FBSD_1.6"

Full log here: http://beefy18.nyi.freebsd.org/data/head-amd64-default/p538068_s361855/logs/hs-threadscope-0.2.12.log

Don't tell me this is another breaking change that would require us to have another flavor of bootstrap compiler.

kib added a comment.Jun 6 2020, 5:58 PM
In D25117#554572, @arrowd wrote:

Some Haskell ports are now failing with

ld-elf.so.1: /usr/local/bin/cabal: Undefined symbol "pthread_setname_np@FBSD_1.6"

Full log here: http://beefy18.nyi.freebsd.org/data/head-amd64-default/p538068_s361855/logs/hs-threadscope-0.2.12.log

Don't tell me this is another breaking change that would require us to have another flavor of bootstrap compiler.

I do not know what exactly happens there, but the message itself means that the binary was built against newer libthr that exports the symbol, but then you tried to activate the binary with libthr that is older and does not export the symbol. We do support backward compatibility, where you can run binary against newer library than it was built against, but not older (that would be forward compatibility, unfortunately we still cannot see the future).

antoine mentioned this in rP538151: Fix build with upcoming pthread_setname_np (Differential Revision D25117).Jun 7 2020, 10:40 AM
antoine accepted this revision.Jun 10 2020, 5:44 PM

Exp-run looks fine

Closed by commit rS362032: Add pthread_getname_np() and pthread_setname_np() aliases for (authored by kib). · Explain WhyJun 10 2020, 10:13 PM
This revision was automatically updated to reflect the committed changes.
kib added a commit: rS362032: Add pthread_getname_np() and pthread_setname_np() aliases for.
jrtc27 mentioned this in D41461: libc: make pthread_getname_np and _pthread_getname_np available.Aug 15 2023, 3:01 AM

Revision Contents
Changeset List

PathSize
include/
3 lines
lib/
libc/
include/
2 lines
2 lines
libthr/
2 lines
thread/
76 lines
share/
man/
man3/
4 lines
39 lines

Diff 72669

View Options

include/pthread.h

Show First 20 Lines • Show All 93 Lines • ▼ Show 20 Lines object = vm_object_allocate_dyn(tmpfs_pager_type, size,
OBJ_COLORED | OBJ_SWAP); OBJ_COLORED | OBJ_SWAP);
if (!swap_pager_init_object(object, NULL, NULL, size, 0)) { if (!swap_pager_init_object(object, NULL, NULL, size, 0)) {
vm_object_deallocate(object); vm_object_deallocate(object);
object = NULL; object = NULL;
} }
return (object); return (object);
} }
/*
* Make sure tmpfs vnodes with writable mappings can be found on the lazy list.
*
* This allows for periodic mtime updates while only scanning vnodes which are
* plausibly dirty, see tmpfs_update_mtime_lazy.
*/
static void static void
tmpfs_pager_writecount_recalc(vm_object_t object, vm_offset_t old,
vm_offset_t new)
{
struct vnode *vp;
VM_OBJECT_ASSERT_WLOCKED(object);
vp = object->un_pager.swp.swp_tmpfs;
/*
* Forced unmount?
*/
if (vp == NULL) {
KASSERT((object->flags & OBJ_TMPFS_VREF) == 0,
("object %p with OBJ_TMPFS_VREF but without vnode", object));
VM_OBJECT_WUNLOCK(object);
return;
}
if (old == 0) {
VNASSERT((object->flags & OBJ_TMPFS_VREF) == 0, vp,
("object without writtable mappings has a reference"));
markjUnsubmitted
Not Done
Inline Actions
VNASSERT((object->flags & OBJ_TMPFS_VREF) == 0, vp,
- ("object without writtable mappings has a reference"));
+ ("object without writable mappings has a reference"));
VNPASS(vp->v_usecount > 0, vp);
markj:
VNPASS(vp->v_usecount > 0, vp);
} else {
VNASSERT((object->flags & OBJ_TMPFS_VREF) != 0, vp,
("object with writtable mappings does not have a reference"));
markjUnsubmitted
Not Done
Inline Actions
VNASSERT((object->flags & OBJ_TMPFS_VREF) != 0, vp,
- ("object with writtable mappings does not have a reference"));
+ ("object with writable mappings does not have a reference"));
}
if (old == new) {
markj:
mjgAuthorUnsubmitted
Done
Inline Actions

fixed locally

mjg: fixed locally
}
if (old == new) {
VM_OBJECT_WUNLOCK(object);
return;
}
if (new == 0) {
vm_object_clear_flag(object, OBJ_TMPFS_VREF);
VM_OBJECT_WUNLOCK(object);
vrele(vp);
} else {
if ((object->flags & OBJ_TMPFS_VREF) == 0) {
vref(vp);
vlazy(vp);
vm_object_set_flag(object, OBJ_TMPFS_VREF);
}
VM_OBJECT_WUNLOCK(object);
}
}
static void
tmpfs_pager_update_writecount(vm_object_t object, vm_offset_t start,
vm_offset_t end)
{
vm_offset_t new, old;
VM_OBJECT_WLOCK(object);
KASSERT((object->flags & OBJ_ANON) == 0,
mjgAuthorUnsubmitted
Done
Inline Actions

I don't know if this assert is of any use, cargo culted this bit from the original swap pager.

mjg: I don't know if this assert is of any use, cargo culted this bit from the original swap pager.
kibUnsubmitted
Not Done
Inline Actions

It does make sense, but perhaps replace the word 'Splittable' with 'tmpfs vm'

kib: It does make sense, but perhaps replace the word 'Splittable' with 'tmpfs vm'
("Splittable object with writecount"));
old = object->un_pager.swp.writemappings;
object->un_pager.swp.writemappings += (vm_ooffset_t)end - start;
new = object->un_pager.swp.writemappings;
tmpfs_pager_writecount_recalc(object, old, new);
VM_OBJECT_ASSERT_UNLOCKED(object);
}
static void
tmpfs_pager_release_writecount(vm_object_t object, vm_offset_t start,
vm_offset_t end)
{
vm_offset_t new, old;
VM_OBJECT_WLOCK(object);
KASSERT((object->flags & OBJ_ANON) == 0,
("Splittable object with writecount"));
old = object->un_pager.swp.writemappings;
object->un_pager.swp.writemappings -= (vm_ooffset_t)end - start;
new = object->un_pager.swp.writemappings;
tmpfs_pager_writecount_recalc(object, old, new);
VM_OBJECT_ASSERT_UNLOCKED(object);
}
static void
tmpfs_pager_getvp(vm_object_t object, struct vnode **vpp, bool *vp_heldp) tmpfs_pager_getvp(vm_object_t object, struct vnode **vpp, bool *vp_heldp)
{ {
struct vnode *vp; struct vnode *vp;
/* /*
* Tmpfs VREG node, which was reclaimed, has tmpfs_pager_type * Tmpfs VREG node, which was reclaimed, has tmpfs_pager_type
* type, but not OBJ_TMPFS flag. In this case there is no * type, but not OBJ_TMPFS flag. In this case there is no
* v_writecount to adjust. * v_writecount to adjust.
Show All 15 Linestmpfs_pager_getvp(vm_object_t object, struct vnode **vpp, bool *vp_heldp)
if (vp_heldp != NULL) if (vp_heldp != NULL)
VM_OBJECT_RUNLOCK(object); VM_OBJECT_RUNLOCK(object);
} }
struct pagerops tmpfs_pager_ops = { struct pagerops tmpfs_pager_ops = {
.pgo_kvme_type = KVME_TYPE_VNODE, .pgo_kvme_type = KVME_TYPE_VNODE,
.pgo_alloc = tmpfs_pager_alloc, .pgo_alloc = tmpfs_pager_alloc,
.pgo_set_writeable_dirty = vm_object_set_writeable_dirty_, .pgo_set_writeable_dirty = vm_object_set_writeable_dirty_,
.pgo_update_writecount = tmpfs_pager_update_writecount,
.pgo_release_writecount = tmpfs_pager_release_writecount,
.pgo_mightbedirty = vm_object_mightbedirty_, .pgo_mightbedirty = vm_object_mightbedirty_,
.pgo_getvp = tmpfs_pager_getvp, .pgo_getvp = tmpfs_pager_getvp,
}; };
static int static int
tmpfs_node_ctor(void *mem, int size, void *arg, int flags) tmpfs_node_ctor(void *mem, int size, void *arg, int flags)
{ {
struct tmpfs_node *node; struct tmpfs_node *node;
▲ Show 20 Lines • Show All 496 Lines • ▼ Show 20 Linestmpfs_free_dirent(struct tmpfs_mount *tmp, struct tmpfs_dirent *de)
if (!tmpfs_dirent_duphead(de) && de->ud.td_name != NULL) if (!tmpfs_dirent_duphead(de) && de->ud.td_name != NULL)
free(de->ud.td_name, M_TMPFSNAME); free(de->ud.td_name, M_TMPFSNAME);
free(de, M_TMPFSDIR); free(de, M_TMPFSDIR);
} }
void void
tmpfs_destroy_vobject(struct vnode *vp, vm_object_t obj) tmpfs_destroy_vobject(struct vnode *vp, vm_object_t obj)
{ {
bool want_vrele;
ASSERT_VOP_ELOCKED(vp, "tmpfs_destroy_vobject"); ASSERT_VOP_ELOCKED(vp, "tmpfs_destroy_vobject");
if (vp->v_type != VREG || obj == NULL) if (vp->v_type != VREG || obj == NULL)
return; return;
VM_OBJECT_WLOCK(obj); VM_OBJECT_WLOCK(obj);
VI_LOCK(vp); VI_LOCK(vp);
/*
* May be going through forced unmount.
*/
want_vrele = false;
if ((obj->flags & OBJ_TMPFS_VREF) != 0) {
vm_object_clear_flag(obj, OBJ_TMPFS_VREF);
want_vrele = true;
}
kibUnsubmitted
Not Done
Inline Actions

There should be a blank line after the last line of the text where the multi-line comment applies.

kib: There should be a blank line after the last line of the text where the multi-line comment…
vm_object_clear_flag(obj, OBJ_TMPFS); vm_object_clear_flag(obj, OBJ_TMPFS);
obj->un_pager.swp.swp_tmpfs = NULL; obj->un_pager.swp.swp_tmpfs = NULL;
if (vp->v_writecount < 0) if (vp->v_writecount < 0)
vp->v_writecount = 0; vp->v_writecount = 0;
VI_UNLOCK(vp); VI_UNLOCK(vp);
VM_OBJECT_WUNLOCK(obj); VM_OBJECT_WUNLOCK(obj);
if (want_vrele) {
vrele(vp);
}
} }
/* /*
* Need to clear v_object for insmntque failure. * Need to clear v_object for insmntque failure.
*/ */
static void static void
tmpfs_insmntque_dtr(struct vnode *vp, void *dtr_arg) tmpfs_insmntque_dtr(struct vnode *vp, void *dtr_arg)
{ {
▲ Show 20 Lines • Show All 1,397 Lines • Show Last 20 Lines
View Options

lib/libc/include/namespace.h

Show First 20 Lines • Show All 93 Lines • ▼ Show 20 Lines object = vm_object_allocate_dyn(tmpfs_pager_type, size,
OBJ_COLORED | OBJ_SWAP); OBJ_COLORED | OBJ_SWAP);
if (!swap_pager_init_object(object, NULL, NULL, size, 0)) { if (!swap_pager_init_object(object, NULL, NULL, size, 0)) {
vm_object_deallocate(object); vm_object_deallocate(object);
object = NULL; object = NULL;
} }
return (object); return (object);
} }
/*
* Make sure tmpfs vnodes with writable mappings can be found on the lazy list.
*
* This allows for periodic mtime updates while only scanning vnodes which are
* plausibly dirty, see tmpfs_update_mtime_lazy.
*/
static void static void
tmpfs_pager_writecount_recalc(vm_object_t object, vm_offset_t old,
vm_offset_t new)
{
struct vnode *vp;
VM_OBJECT_ASSERT_WLOCKED(object);
vp = object->un_pager.swp.swp_tmpfs;
/*
* Forced unmount?
*/
if (vp == NULL) {
KASSERT((object->flags & OBJ_TMPFS_VREF) == 0,
("object %p with OBJ_TMPFS_VREF but without vnode", object));
VM_OBJECT_WUNLOCK(object);
return;
}
if (old == 0) {
VNASSERT((object->flags & OBJ_TMPFS_VREF) == 0, vp,
("object without writtable mappings has a reference"));
markjUnsubmitted
Not Done
Inline Actions
VNASSERT((object->flags & OBJ_TMPFS_VREF) == 0, vp,
- ("object without writtable mappings has a reference"));
+ ("object without writable mappings has a reference"));
VNPASS(vp->v_usecount > 0, vp);
markj:
VNPASS(vp->v_usecount > 0, vp);
} else {
VNASSERT((object->flags & OBJ_TMPFS_VREF) != 0, vp,
("object with writtable mappings does not have a reference"));
markjUnsubmitted
Not Done
Inline Actions
VNASSERT((object->flags & OBJ_TMPFS_VREF) != 0, vp,
- ("object with writtable mappings does not have a reference"));
+ ("object with writable mappings does not have a reference"));
}
if (old == new) {
markj:
mjgAuthorUnsubmitted
Done
Inline Actions

fixed locally

mjg: fixed locally
}
if (old == new) {
VM_OBJECT_WUNLOCK(object);
return;
}
if (new == 0) {
vm_object_clear_flag(object, OBJ_TMPFS_VREF);
VM_OBJECT_WUNLOCK(object);
vrele(vp);
} else {
if ((object->flags & OBJ_TMPFS_VREF) == 0) {
vref(vp);
vlazy(vp);
vm_object_set_flag(object, OBJ_TMPFS_VREF);
}
VM_OBJECT_WUNLOCK(object);
}
}
static void
tmpfs_pager_update_writecount(vm_object_t object, vm_offset_t start,
vm_offset_t end)
{
vm_offset_t new, old;
VM_OBJECT_WLOCK(object);
KASSERT((object->flags & OBJ_ANON) == 0,
mjgAuthorUnsubmitted
Done
Inline Actions

I don't know if this assert is of any use, cargo culted this bit from the original swap pager.

mjg: I don't know if this assert is of any use, cargo culted this bit from the original swap pager.
kibUnsubmitted
Not Done
Inline Actions

It does make sense, but perhaps replace the word 'Splittable' with 'tmpfs vm'

kib: It does make sense, but perhaps replace the word 'Splittable' with 'tmpfs vm'
("Splittable object with writecount"));
old = object->un_pager.swp.writemappings;
object->un_pager.swp.writemappings += (vm_ooffset_t)end - start;
new = object->un_pager.swp.writemappings;
tmpfs_pager_writecount_recalc(object, old, new);
VM_OBJECT_ASSERT_UNLOCKED(object);
}
static void
tmpfs_pager_release_writecount(vm_object_t object, vm_offset_t start,
vm_offset_t end)
{
vm_offset_t new, old;
VM_OBJECT_WLOCK(object);
KASSERT((object->flags & OBJ_ANON) == 0,
("Splittable object with writecount"));
old = object->un_pager.swp.writemappings;
object->un_pager.swp.writemappings -= (vm_ooffset_t)end - start;
new = object->un_pager.swp.writemappings;
tmpfs_pager_writecount_recalc(object, old, new);
VM_OBJECT_ASSERT_UNLOCKED(object);
}
static void
tmpfs_pager_getvp(vm_object_t object, struct vnode **vpp, bool *vp_heldp) tmpfs_pager_getvp(vm_object_t object, struct vnode **vpp, bool *vp_heldp)
{ {
struct vnode *vp; struct vnode *vp;
/* /*
* Tmpfs VREG node, which was reclaimed, has tmpfs_pager_type * Tmpfs VREG node, which was reclaimed, has tmpfs_pager_type
* type, but not OBJ_TMPFS flag. In this case there is no * type, but not OBJ_TMPFS flag. In this case there is no
* v_writecount to adjust. * v_writecount to adjust.
Show All 15 Linestmpfs_pager_getvp(vm_object_t object, struct vnode **vpp, bool *vp_heldp)
if (vp_heldp != NULL) if (vp_heldp != NULL)
VM_OBJECT_RUNLOCK(object); VM_OBJECT_RUNLOCK(object);
} }
struct pagerops tmpfs_pager_ops = { struct pagerops tmpfs_pager_ops = {
.pgo_kvme_type = KVME_TYPE_VNODE, .pgo_kvme_type = KVME_TYPE_VNODE,
.pgo_alloc = tmpfs_pager_alloc, .pgo_alloc = tmpfs_pager_alloc,
.pgo_set_writeable_dirty = vm_object_set_writeable_dirty_, .pgo_set_writeable_dirty = vm_object_set_writeable_dirty_,
.pgo_update_writecount = tmpfs_pager_update_writecount,
.pgo_release_writecount = tmpfs_pager_release_writecount,
.pgo_mightbedirty = vm_object_mightbedirty_, .pgo_mightbedirty = vm_object_mightbedirty_,
.pgo_getvp = tmpfs_pager_getvp, .pgo_getvp = tmpfs_pager_getvp,
}; };
static int static int
tmpfs_node_ctor(void *mem, int size, void *arg, int flags) tmpfs_node_ctor(void *mem, int size, void *arg, int flags)
{ {
struct tmpfs_node *node; struct tmpfs_node *node;
▲ Show 20 Lines • Show All 496 Lines • ▼ Show 20 Linestmpfs_free_dirent(struct tmpfs_mount *tmp, struct tmpfs_dirent *de)
if (!tmpfs_dirent_duphead(de) && de->ud.td_name != NULL) if (!tmpfs_dirent_duphead(de) && de->ud.td_name != NULL)
free(de->ud.td_name, M_TMPFSNAME); free(de->ud.td_name, M_TMPFSNAME);
free(de, M_TMPFSDIR); free(de, M_TMPFSDIR);
} }
void void
tmpfs_destroy_vobject(struct vnode *vp, vm_object_t obj) tmpfs_destroy_vobject(struct vnode *vp, vm_object_t obj)
{ {
bool want_vrele;
ASSERT_VOP_ELOCKED(vp, "tmpfs_destroy_vobject"); ASSERT_VOP_ELOCKED(vp, "tmpfs_destroy_vobject");
if (vp->v_type != VREG || obj == NULL) if (vp->v_type != VREG || obj == NULL)
return; return;
VM_OBJECT_WLOCK(obj); VM_OBJECT_WLOCK(obj);
VI_LOCK(vp); VI_LOCK(vp);
/*
* May be going through forced unmount.
*/
want_vrele = false;
if ((obj->flags & OBJ_TMPFS_VREF) != 0) {
vm_object_clear_flag(obj, OBJ_TMPFS_VREF);
want_vrele = true;
}
kibUnsubmitted
Not Done
Inline Actions

There should be a blank line after the last line of the text where the multi-line comment applies.

kib: There should be a blank line after the last line of the text where the multi-line comment…
vm_object_clear_flag(obj, OBJ_TMPFS); vm_object_clear_flag(obj, OBJ_TMPFS);
obj->un_pager.swp.swp_tmpfs = NULL; obj->un_pager.swp.swp_tmpfs = NULL;
if (vp->v_writecount < 0) if (vp->v_writecount < 0)
vp->v_writecount = 0; vp->v_writecount = 0;
VI_UNLOCK(vp); VI_UNLOCK(vp);
VM_OBJECT_WUNLOCK(obj); VM_OBJECT_WUNLOCK(obj);
if (want_vrele) {
vrele(vp);
}
} }
/* /*
* Need to clear v_object for insmntque failure. * Need to clear v_object for insmntque failure.
*/ */
static void static void
tmpfs_insmntque_dtr(struct vnode *vp, void *dtr_arg) tmpfs_insmntque_dtr(struct vnode *vp, void *dtr_arg)
{ {
▲ Show 20 Lines • Show All 1,397 Lines • Show Last 20 Lines
View Options

lib/libc/include/un-namespace.h

Show First 20 Lines • Show All 93 Lines • ▼ Show 20 Lines object = vm_object_allocate_dyn(tmpfs_pager_type, size,
OBJ_COLORED | OBJ_SWAP); OBJ_COLORED | OBJ_SWAP);
if (!swap_pager_init_object(object, NULL, NULL, size, 0)) { if (!swap_pager_init_object(object, NULL, NULL, size, 0)) {
vm_object_deallocate(object); vm_object_deallocate(object);
object = NULL; object = NULL;
} }
return (object); return (object);
} }
/*
* Make sure tmpfs vnodes with writable mappings can be found on the lazy list.
*
* This allows for periodic mtime updates while only scanning vnodes which are
* plausibly dirty, see tmpfs_update_mtime_lazy.
*/
static void static void
tmpfs_pager_writecount_recalc(vm_object_t object, vm_offset_t old,
vm_offset_t new)
{
struct vnode *vp;
VM_OBJECT_ASSERT_WLOCKED(object);
vp = object->un_pager.swp.swp_tmpfs;
/*
* Forced unmount?
*/
if (vp == NULL) {
KASSERT((object->flags & OBJ_TMPFS_VREF) == 0,
("object %p with OBJ_TMPFS_VREF but without vnode", object));
VM_OBJECT_WUNLOCK(object);
return;
}
if (old == 0) {
VNASSERT((object->flags & OBJ_TMPFS_VREF) == 0, vp,
("object without writtable mappings has a reference"));
markjUnsubmitted
Not Done
Inline Actions
VNASSERT((object->flags & OBJ_TMPFS_VREF) == 0, vp,
- ("object without writtable mappings has a reference"));
+ ("object without writable mappings has a reference"));
VNPASS(vp->v_usecount > 0, vp);
markj:
VNPASS(vp->v_usecount > 0, vp);
} else {
VNASSERT((object->flags & OBJ_TMPFS_VREF) != 0, vp,
("object with writtable mappings does not have a reference"));
markjUnsubmitted
Not Done
Inline Actions
VNASSERT((object->flags & OBJ_TMPFS_VREF) != 0, vp,
- ("object with writtable mappings does not have a reference"));
+ ("object with writable mappings does not have a reference"));
}
if (old == new) {
markj:
mjgAuthorUnsubmitted
Done
Inline Actions

fixed locally

mjg: fixed locally
}
if (old == new) {
VM_OBJECT_WUNLOCK(object);
return;
}
if (new == 0) {
vm_object_clear_flag(object, OBJ_TMPFS_VREF);
VM_OBJECT_WUNLOCK(object);
vrele(vp);
} else {
if ((object->flags & OBJ_TMPFS_VREF) == 0) {
vref(vp);
vlazy(vp);
vm_object_set_flag(object, OBJ_TMPFS_VREF);
}
VM_OBJECT_WUNLOCK(object);
}
}
static void
tmpfs_pager_update_writecount(vm_object_t object, vm_offset_t start,
vm_offset_t end)
{
vm_offset_t new, old;
VM_OBJECT_WLOCK(object);
KASSERT((object->flags & OBJ_ANON) == 0,
mjgAuthorUnsubmitted
Done
Inline Actions

I don't know if this assert is of any use, cargo culted this bit from the original swap pager.

mjg: I don't know if this assert is of any use, cargo culted this bit from the original swap pager.
kibUnsubmitted
Not Done
Inline Actions

It does make sense, but perhaps replace the word 'Splittable' with 'tmpfs vm'

kib: It does make sense, but perhaps replace the word 'Splittable' with 'tmpfs vm'
("Splittable object with writecount"));
old = object->un_pager.swp.writemappings;
object->un_pager.swp.writemappings += (vm_ooffset_t)end - start;
new = object->un_pager.swp.writemappings;
tmpfs_pager_writecount_recalc(object, old, new);
VM_OBJECT_ASSERT_UNLOCKED(object);
}
static void
tmpfs_pager_release_writecount(vm_object_t object, vm_offset_t start,
vm_offset_t end)
{
vm_offset_t new, old;
VM_OBJECT_WLOCK(object);
KASSERT((object->flags & OBJ_ANON) == 0,
("Splittable object with writecount"));
old = object->un_pager.swp.writemappings;
object->un_pager.swp.writemappings -= (vm_ooffset_t)end - start;
new = object->un_pager.swp.writemappings;
tmpfs_pager_writecount_recalc(object, old, new);
VM_OBJECT_ASSERT_UNLOCKED(object);
}
static void
tmpfs_pager_getvp(vm_object_t object, struct vnode **vpp, bool *vp_heldp) tmpfs_pager_getvp(vm_object_t object, struct vnode **vpp, bool *vp_heldp)
{ {
struct vnode *vp; struct vnode *vp;
/* /*
* Tmpfs VREG node, which was reclaimed, has tmpfs_pager_type * Tmpfs VREG node, which was reclaimed, has tmpfs_pager_type
* type, but not OBJ_TMPFS flag. In this case there is no * type, but not OBJ_TMPFS flag. In this case there is no
* v_writecount to adjust. * v_writecount to adjust.
Show All 15 Linestmpfs_pager_getvp(vm_object_t object, struct vnode **vpp, bool *vp_heldp)
if (vp_heldp != NULL) if (vp_heldp != NULL)
VM_OBJECT_RUNLOCK(object); VM_OBJECT_RUNLOCK(object);
} }
struct pagerops tmpfs_pager_ops = { struct pagerops tmpfs_pager_ops = {
.pgo_kvme_type = KVME_TYPE_VNODE, .pgo_kvme_type = KVME_TYPE_VNODE,
.pgo_alloc = tmpfs_pager_alloc, .pgo_alloc = tmpfs_pager_alloc,
.pgo_set_writeable_dirty = vm_object_set_writeable_dirty_, .pgo_set_writeable_dirty = vm_object_set_writeable_dirty_,
.pgo_update_writecount = tmpfs_pager_update_writecount,
.pgo_release_writecount = tmpfs_pager_release_writecount,
.pgo_mightbedirty = vm_object_mightbedirty_, .pgo_mightbedirty = vm_object_mightbedirty_,
.pgo_getvp = tmpfs_pager_getvp, .pgo_getvp = tmpfs_pager_getvp,
}; };
static int static int
tmpfs_node_ctor(void *mem, int size, void *arg, int flags) tmpfs_node_ctor(void *mem, int size, void *arg, int flags)
{ {
struct tmpfs_node *node; struct tmpfs_node *node;
▲ Show 20 Lines • Show All 496 Lines • ▼ Show 20 Linestmpfs_free_dirent(struct tmpfs_mount *tmp, struct tmpfs_dirent *de)
if (!tmpfs_dirent_duphead(de) && de->ud.td_name != NULL) if (!tmpfs_dirent_duphead(de) && de->ud.td_name != NULL)
free(de->ud.td_name, M_TMPFSNAME); free(de->ud.td_name, M_TMPFSNAME);
free(de, M_TMPFSDIR); free(de, M_TMPFSDIR);
} }
void void
tmpfs_destroy_vobject(struct vnode *vp, vm_object_t obj) tmpfs_destroy_vobject(struct vnode *vp, vm_object_t obj)
{ {
bool want_vrele;
ASSERT_VOP_ELOCKED(vp, "tmpfs_destroy_vobject"); ASSERT_VOP_ELOCKED(vp, "tmpfs_destroy_vobject");
if (vp->v_type != VREG || obj == NULL) if (vp->v_type != VREG || obj == NULL)
return; return;
VM_OBJECT_WLOCK(obj); VM_OBJECT_WLOCK(obj);
VI_LOCK(vp); VI_LOCK(vp);
/*
* May be going through forced unmount.
*/
want_vrele = false;
if ((obj->flags & OBJ_TMPFS_VREF) != 0) {
vm_object_clear_flag(obj, OBJ_TMPFS_VREF);
want_vrele = true;
}
kibUnsubmitted
Not Done
Inline Actions

There should be a blank line after the last line of the text where the multi-line comment applies.

kib: There should be a blank line after the last line of the text where the multi-line comment…
vm_object_clear_flag(obj, OBJ_TMPFS); vm_object_clear_flag(obj, OBJ_TMPFS);
obj->un_pager.swp.swp_tmpfs = NULL; obj->un_pager.swp.swp_tmpfs = NULL;
if (vp->v_writecount < 0) if (vp->v_writecount < 0)
vp->v_writecount = 0; vp->v_writecount = 0;
VI_UNLOCK(vp); VI_UNLOCK(vp);
VM_OBJECT_WUNLOCK(obj); VM_OBJECT_WUNLOCK(obj);
if (want_vrele) {
vrele(vp);
}
} }
/* /*
* Need to clear v_object for insmntque failure. * Need to clear v_object for insmntque failure.
*/ */
static void static void
tmpfs_insmntque_dtr(struct vnode *vp, void *dtr_arg) tmpfs_insmntque_dtr(struct vnode *vp, void *dtr_arg)
{ {
▲ Show 20 Lines • Show All 1,397 Lines • Show Last 20 Lines
View Options

lib/libthr/pthread.map

Show First 20 Lines • Show All 93 Lines • ▼ Show 20 Lines object = vm_object_allocate_dyn(tmpfs_pager_type, size,
OBJ_COLORED | OBJ_SWAP); OBJ_COLORED | OBJ_SWAP);
if (!swap_pager_init_object(object, NULL, NULL, size, 0)) { if (!swap_pager_init_object(object, NULL, NULL, size, 0)) {
vm_object_deallocate(object); vm_object_deallocate(object);
object = NULL; object = NULL;
} }
return (object); return (object);
} }
/*
* Make sure tmpfs vnodes with writable mappings can be found on the lazy list.
*
* This allows for periodic mtime updates while only scanning vnodes which are
* plausibly dirty, see tmpfs_update_mtime_lazy.
*/
static void static void
tmpfs_pager_writecount_recalc(vm_object_t object, vm_offset_t old,
vm_offset_t new)
{
struct vnode *vp;
VM_OBJECT_ASSERT_WLOCKED(object);
vp = object->un_pager.swp.swp_tmpfs;
/*
* Forced unmount?
*/
if (vp == NULL) {
KASSERT((object->flags & OBJ_TMPFS_VREF) == 0,
("object %p with OBJ_TMPFS_VREF but without vnode", object));
VM_OBJECT_WUNLOCK(object);
return;
}
if (old == 0) {
VNASSERT((object->flags & OBJ_TMPFS_VREF) == 0, vp,
("object without writtable mappings has a reference"));
markjUnsubmitted
Not Done
Inline Actions
VNASSERT((object->flags & OBJ_TMPFS_VREF) == 0, vp,
- ("object without writtable mappings has a reference"));
+ ("object without writable mappings has a reference"));
VNPASS(vp->v_usecount > 0, vp);
markj:
VNPASS(vp->v_usecount > 0, vp);
} else {
VNASSERT((object->flags & OBJ_TMPFS_VREF) != 0, vp,
("object with writtable mappings does not have a reference"));
markjUnsubmitted
Not Done
Inline Actions
VNASSERT((object->flags & OBJ_TMPFS_VREF) != 0, vp,
- ("object with writtable mappings does not have a reference"));
+ ("object with writable mappings does not have a reference"));
}
if (old == new) {
markj:
mjgAuthorUnsubmitted
Done
Inline Actions

fixed locally

mjg: fixed locally
}
if (old == new) {
VM_OBJECT_WUNLOCK(object);
return;
}
if (new == 0) {
vm_object_clear_flag(object, OBJ_TMPFS_VREF);
VM_OBJECT_WUNLOCK(object);
vrele(vp);
} else {
if ((object->flags & OBJ_TMPFS_VREF) == 0) {
vref(vp);
vlazy(vp);
vm_object_set_flag(object, OBJ_TMPFS_VREF);
}
VM_OBJECT_WUNLOCK(object);
}
}
static void
tmpfs_pager_update_writecount(vm_object_t object, vm_offset_t start,
vm_offset_t end)
{
vm_offset_t new, old;
VM_OBJECT_WLOCK(object);
KASSERT((object->flags & OBJ_ANON) == 0,
mjgAuthorUnsubmitted
Done
Inline Actions

I don't know if this assert is of any use, cargo culted this bit from the original swap pager.

mjg: I don't know if this assert is of any use, cargo culted this bit from the original swap pager.
kibUnsubmitted
Not Done
Inline Actions

It does make sense, but perhaps replace the word 'Splittable' with 'tmpfs vm'

kib: It does make sense, but perhaps replace the word 'Splittable' with 'tmpfs vm'
("Splittable object with writecount"));
old = object->un_pager.swp.writemappings;
object->un_pager.swp.writemappings += (vm_ooffset_t)end - start;
new = object->un_pager.swp.writemappings;
tmpfs_pager_writecount_recalc(object, old, new);
VM_OBJECT_ASSERT_UNLOCKED(object);
}
static void
tmpfs_pager_release_writecount(vm_object_t object, vm_offset_t start,
vm_offset_t end)
{
vm_offset_t new, old;
VM_OBJECT_WLOCK(object);
KASSERT((object->flags & OBJ_ANON) == 0,
("Splittable object with writecount"));
old = object->un_pager.swp.writemappings;
object->un_pager.swp.writemappings -= (vm_ooffset_t)end - start;
new = object->un_pager.swp.writemappings;
tmpfs_pager_writecount_recalc(object, old, new);
VM_OBJECT_ASSERT_UNLOCKED(object);
}
static void
tmpfs_pager_getvp(vm_object_t object, struct vnode **vpp, bool *vp_heldp) tmpfs_pager_getvp(vm_object_t object, struct vnode **vpp, bool *vp_heldp)
{ {
struct vnode *vp; struct vnode *vp;
/* /*
* Tmpfs VREG node, which was reclaimed, has tmpfs_pager_type * Tmpfs VREG node, which was reclaimed, has tmpfs_pager_type
* type, but not OBJ_TMPFS flag. In this case there is no * type, but not OBJ_TMPFS flag. In this case there is no
* v_writecount to adjust. * v_writecount to adjust.
Show All 15 Linestmpfs_pager_getvp(vm_object_t object, struct vnode **vpp, bool *vp_heldp)
if (vp_heldp != NULL) if (vp_heldp != NULL)
VM_OBJECT_RUNLOCK(object); VM_OBJECT_RUNLOCK(object);
} }
struct pagerops tmpfs_pager_ops = { struct pagerops tmpfs_pager_ops = {
.pgo_kvme_type = KVME_TYPE_VNODE, .pgo_kvme_type = KVME_TYPE_VNODE,
.pgo_alloc = tmpfs_pager_alloc, .pgo_alloc = tmpfs_pager_alloc,
.pgo_set_writeable_dirty = vm_object_set_writeable_dirty_, .pgo_set_writeable_dirty = vm_object_set_writeable_dirty_,
.pgo_update_writecount = tmpfs_pager_update_writecount,
.pgo_release_writecount = tmpfs_pager_release_writecount,
.pgo_mightbedirty = vm_object_mightbedirty_, .pgo_mightbedirty = vm_object_mightbedirty_,
.pgo_getvp = tmpfs_pager_getvp, .pgo_getvp = tmpfs_pager_getvp,
}; };
static int static int
tmpfs_node_ctor(void *mem, int size, void *arg, int flags) tmpfs_node_ctor(void *mem, int size, void *arg, int flags)
{ {
struct tmpfs_node *node; struct tmpfs_node *node;
▲ Show 20 Lines • Show All 496 Lines • ▼ Show 20 Linestmpfs_free_dirent(struct tmpfs_mount *tmp, struct tmpfs_dirent *de)
if (!tmpfs_dirent_duphead(de) && de->ud.td_name != NULL) if (!tmpfs_dirent_duphead(de) && de->ud.td_name != NULL)
free(de->ud.td_name, M_TMPFSNAME); free(de->ud.td_name, M_TMPFSNAME);
free(de, M_TMPFSDIR); free(de, M_TMPFSDIR);
} }
void void
tmpfs_destroy_vobject(struct vnode *vp, vm_object_t obj) tmpfs_destroy_vobject(struct vnode *vp, vm_object_t obj)
{ {
bool want_vrele;
ASSERT_VOP_ELOCKED(vp, "tmpfs_destroy_vobject"); ASSERT_VOP_ELOCKED(vp, "tmpfs_destroy_vobject");
if (vp->v_type != VREG || obj == NULL) if (vp->v_type != VREG || obj == NULL)
return; return;
VM_OBJECT_WLOCK(obj); VM_OBJECT_WLOCK(obj);
VI_LOCK(vp); VI_LOCK(vp);
/*
* May be going through forced unmount.
*/
want_vrele = false;
if ((obj->flags & OBJ_TMPFS_VREF) != 0) {
vm_object_clear_flag(obj, OBJ_TMPFS_VREF);
want_vrele = true;
}
kibUnsubmitted
Not Done
Inline Actions

There should be a blank line after the last line of the text where the multi-line comment applies.

kib: There should be a blank line after the last line of the text where the multi-line comment…
vm_object_clear_flag(obj, OBJ_TMPFS); vm_object_clear_flag(obj, OBJ_TMPFS);
obj->un_pager.swp.swp_tmpfs = NULL; obj->un_pager.swp.swp_tmpfs = NULL;
if (vp->v_writecount < 0) if (vp->v_writecount < 0)
vp->v_writecount = 0; vp->v_writecount = 0;
VI_UNLOCK(vp); VI_UNLOCK(vp);
VM_OBJECT_WUNLOCK(obj); VM_OBJECT_WUNLOCK(obj);
if (want_vrele) {
vrele(vp);
}
} }
/* /*
* Need to clear v_object for insmntque failure. * Need to clear v_object for insmntque failure.
*/ */
static void static void
tmpfs_insmntque_dtr(struct vnode *vp, void *dtr_arg) tmpfs_insmntque_dtr(struct vnode *vp, void *dtr_arg)
{ {
▲ Show 20 Lines • Show All 1,397 Lines • Show Last 20 Lines
View Options

lib/libthr/thread/thr_info.c

Loading...
View Options

share/man/man3/Makefile

Loading...
View Options

share/man/man3/pthread_set_name_np.3

Loading...