8180039: Use more portable print format/arguments for rlim_t

Reviewed-by: dholmes, mgerdin, stuefe
This commit is contained in:
Mikael Vidstedt 2017-05-11 08:40:32 -07:00
parent 83205603a6
commit 41f95937de

View file

@ -207,30 +207,30 @@ void os::Posix::print_rlimit_info(outputStream* st) {
st->print(" STACK "); st->print(" STACK ");
getrlimit(RLIMIT_STACK, &rlim); getrlimit(RLIMIT_STACK, &rlim);
if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity"); if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity");
else st->print("%luk", rlim.rlim_cur >> 10); else st->print(UINT64_FORMAT "k", uint64_t(rlim.rlim_cur) >> 10);
st->print(", CORE "); st->print(", CORE ");
getrlimit(RLIMIT_CORE, &rlim); getrlimit(RLIMIT_CORE, &rlim);
if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity"); if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity");
else st->print("%luk", rlim.rlim_cur >> 10); else st->print(UINT64_FORMAT "k", uint64_t(rlim.rlim_cur) >> 10);
// Isn't there on solaris // Isn't there on solaris
#if !defined(SOLARIS) && !defined(AIX) #if !defined(SOLARIS) && !defined(AIX)
st->print(", NPROC "); st->print(", NPROC ");
getrlimit(RLIMIT_NPROC, &rlim); getrlimit(RLIMIT_NPROC, &rlim);
if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity"); if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity");
else st->print("%lu", rlim.rlim_cur); else st->print(UINT64_FORMAT, uint64_t(rlim.rlim_cur));
#endif #endif
st->print(", NOFILE "); st->print(", NOFILE ");
getrlimit(RLIMIT_NOFILE, &rlim); getrlimit(RLIMIT_NOFILE, &rlim);
if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity"); if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity");
else st->print("%lu", rlim.rlim_cur); else st->print(UINT64_FORMAT, uint64_t(rlim.rlim_cur));
st->print(", AS "); st->print(", AS ");
getrlimit(RLIMIT_AS, &rlim); getrlimit(RLIMIT_AS, &rlim);
if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity"); if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity");
else st->print("%luk", rlim.rlim_cur >> 10); else st->print(UINT64_FORMAT "k", uint64_t(rlim.rlim_cur) >> 10);
st->cr(); st->cr();
} }