lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-09-02 16:01:20 +03:00
Code Activity

1999-09-19 Roland McGrath <roland@baalperazim.frob.com>

Browse Source 
* hurd/hurdprio.c (_hurd_priority_which_map): Rearrange the code a bit.
	Use __munmap instead of __vm_deallocate.
This commit is contained in:
Roland McGrath
1999-09-19 05:42:05 +00:00
parent 8a386ec186
commit aefc5849d2
1 changed files with 27 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
hurd/hurdprio.c
View File

@@ -17,8 +17,9 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */ Boston, MA 02111-1307, USA. */
#include <hurd/resource.h>
#include <hurd.h> #include <hurd.h>
#include <hurd/resource.h>
#include <sys/mman.h>
#include <unistd.h> #include <unistd.h>
error_t error_t
@@ -35,64 +36,54 @@ _hurd_priority_which_map (enum __priority_which which, int who,
switch (which) switch (which)
{ {
default:
return EINVAL;
case PRIO_PROCESS: case PRIO_PROCESS:
npids = 1; err = (*function) (who ?: getpid (), 0); /* XXX special-case self? */
pids[0] = who ?: getpid (); /* XXX function could special-case self? */
err = 0;
break; break;
case PRIO_PGRP: case PRIO_PGRP:
err = __USEPORT (PROC, __proc_getpgrppids (port, who, &pids, &npids)); err = __USEPORT (PROC, __proc_getpgrppids (port, who, &pids, &npids));
for (i = 0; !err && i < npids; ++i)
err = (*function) (pids[i], 0);
break; break;
case PRIO_USER: case PRIO_USER:
if (who == 0) if (who == 0)
who = geteuid (); who = geteuid ();
err = __USEPORT (PROC, __proc_getallpids (port, &pids, &npids)); err = __USEPORT (PROC, __proc_getallpids (port, &pids, &npids));
break;
default:
return EINVAL;
}
for (i = 0; !err && i < npids; ++i) for (i = 0; !err && i < npids; ++i)
{
if (which == PRIO_USER)
{ {
/* Get procinfo to check the owner. */ /* Get procinfo to check the owner. */
int *oldpi = pi; int *oldpi = pi;
mach_msg_type_number_t oldpisize = pisize; mach_msg_type_number_t oldpisize = pisize;
char *tw = 0; char *tw = 0;
size_t twsz = 0; size_t twsz = 0;
if (err = __USEPORT (PROC, __proc_getprocinfo (port, pids[i], err = __USEPORT (PROC, __proc_getprocinfo (port, pids[i],
&pi_flags, &pi_flags,
&pi, &pisize, &pi, &pisize,
&tw, &twsz))) &tw, &twsz));
continue; if (!err)
if (twsz) {
/* Gratuitous. */ if (twsz) /* Gratuitous. */
__vm_deallocate (__mach_task_self (), (vm_address_t) tw, twsz); __munmap (tw, twsz);
if (pi != oldpi && oldpi != pibuf) if (pi != oldpi && oldpi != pibuf)
/* Old buffer from last call was not reused; free it. */ /* Old buffer from last call was not reused; free it. */
__vm_deallocate (__mach_task_self (), __munmap (oldpi, oldpisize * sizeof pi[0]);
(vm_address_t) oldpi, oldpisize * sizeof pi[0]);
pip = (struct procinfo *) pi; pip = (struct procinfo *) pi;
if (pip->owner != (uid_t) who) if (pip->owner == (uid_t) who)
continue;
}
else
pip = NULL;
err = (*function) (pids[i], pip); err = (*function) (pids[i], pip);
} }
}
break;
}
if (pids != pidbuf) if (pids != pidbuf)
__vm_deallocate (__mach_task_self (), __munmap (pids, npids * sizeof pids[0]);
(vm_address_t) pids, npids * sizeof pids[0]);
if (pi != pibuf) if (pi != pibuf)
__vm_deallocate (__mach_task_self (), __munmap (pi, pisize * sizeof pi[0]);
(vm_address_t) pi, pisize * sizeof pi[0]);
return err; return err;
} }