git://git.onelab.eu
/
util-vserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 0.30.214.
[util-vserver.git]
/
lib
/
planetlab.h
diff --git
a/lib/planetlab.h
b/lib/planetlab.h
index
fe346aa
..
41a85f0
100644
(file)
--- a/
lib/planetlab.h
+++ b/
lib/planetlab.h
@@
-38,16
+38,16
@@
POSSIBILITY OF SUCH DAMAGE.
struct sliver_resources {
unsigned long long vs_cpu;
struct sliver_resources {
unsigned long long vs_cpu;
- unsigned long long vs_cpuguaranteed;
struct vc_rlimit vs_rss;
struct vc_rlimit vs_as;
struct vc_rlimit vs_nproc;
struct vc_rlimit vs_openfd;
struct vc_rlimit vs_rss;
struct vc_rlimit vs_as;
struct vc_rlimit vs_nproc;
struct vc_rlimit vs_openfd;
- unsigned int vs_whitelisted;
};
};
+int adjust_lim(const struct vc_rlimit *vcr, struct rlimit *lim);
+
int
int
-pl_chcontext(xid_t ctx, uint
32_t flags, uint64_t bcaps,
struct sliver_resources *slr);
+pl_chcontext(xid_t ctx, uint
64_t bcaps, const
struct sliver_resources *slr);
int
pl_setup_done(xid_t ctx);
int
pl_setup_done(xid_t ctx);
@@
-61,10
+61,10
@@
pl_setsched(xid_t ctx, uint32_t cpu_share, uint32_t cpu_sched_flags);
/* Null byte made explicit */
#define NULLBYTE_SIZE 1
/* Null byte made explicit */
#define NULLBYTE_SIZE 1
-void pl_get_limits(char *, struct sliver_resources *);
-void pl_set_
limits(xid_t,
struct sliver_resources *);
+void pl_get_limits(c
onst c
har *, struct sliver_resources *);
+void pl_set_
ulimits(const
struct sliver_resources *);
-static int
+static in
line in
t
_PERROR(const char *format, char *file, int line, int _errno, ...)
{
va_list ap;
_PERROR(const char *format, char *file, int line, int _errno, ...)
{
va_list ap;