[kernel][object] Rename QueryPolicy and GetPolicy methods
Rename JobDispatcher's and ProcessDispatcher's QueryPolicy and
GetPolicy methods in preparation for adding support for timer slack
policy.
Bug: ZX-931 #comment Rename QueryPolicy and GetPolicy methods
Test: /boot/test/sys/policy-test
Change-Id: I1f552622a8beb12bba3e08499323b0438cd210ef
diff --git a/kernel/object/include/object/job_dispatcher.h b/kernel/object/include/object/job_dispatcher.h
index 891fbe1..a3a0503 100644
--- a/kernel/object/include/object/job_dispatcher.h
+++ b/kernel/object/include/object/job_dispatcher.h
@@ -102,7 +102,9 @@
// Set policy. |mode| is is either ZX_JOB_POL_RELATIVE or ZX_JOB_POL_ABSOLUTE and
// in_policy is an array of |count| elements.
- zx_status_t SetPolicy(uint32_t mode, const zx_policy_basic* in_policy, size_t policy_count);
+ zx_status_t SetBasicPolicy(uint32_t mode,
+ const zx_policy_basic* in_policy,
+ size_t policy_count);
JobPolicy GetPolicy() const;
// Calls the provided |zx_status_t func(JobDispatcher*)| on every
diff --git a/kernel/object/include/object/process_dispatcher.h b/kernel/object/include/object/process_dispatcher.h
index 7ad292f..25b57a9 100644
--- a/kernel/object/include/object/process_dispatcher.h
+++ b/kernel/object/include/object/process_dispatcher.h
@@ -242,14 +242,14 @@
// E.g., in sys_channel_create:
//
// auto up = ProcessDispatcher::GetCurrent();
- // zx_status_t res = up->QueryPolicy(ZX_POL_NEW_CHANNEL);
+ // zx_status_t res = up->QueryBasicPolicy(ZX_POL_NEW_CHANNEL);
// if (res != ZX_OK) {
// // Channel creation denied by the calling process's
// // parent job's policy.
// return res;
// }
// // Ok to create a channel.
- zx_status_t QueryPolicy(uint32_t condition) const;
+ zx_status_t QueryBasicPolicy(uint32_t condition) const;
// return a cached copy of the vdso code address or compute a new one
uintptr_t vdso_code_address() {
diff --git a/kernel/object/job_dispatcher.cpp b/kernel/object/job_dispatcher.cpp
index 25528c0..95b14ab 100644
--- a/kernel/object/job_dispatcher.cpp
+++ b/kernel/object/job_dispatcher.cpp
@@ -345,7 +345,7 @@
return true;
}
-zx_status_t JobDispatcher::SetPolicy(
+zx_status_t JobDispatcher::SetBasicPolicy(
uint32_t mode, const zx_policy_basic* in_policy, size_t policy_count) {
// Can't set policy when there are active processes or jobs.
Guard<fbl::Mutex> guard{get_lock()};
diff --git a/kernel/object/process_dispatcher.cpp b/kernel/object/process_dispatcher.cpp
index 060c966..8577600 100644
--- a/kernel/object/process_dispatcher.cpp
+++ b/kernel/object/process_dispatcher.cpp
@@ -402,10 +402,10 @@
// Handle lookup failed. We potentially generate an exception,
// depending on the job policy. Note that we don't use the return
- // value from QueryPolicy() here: ZX_POL_ACTION_ALLOW and
+ // value from QueryBasicPolicy() here: ZX_POL_ACTION_ALLOW and
// ZX_POL_ACTION_DENY are equivalent for ZX_POL_BAD_HANDLE.
if (likely(!skip_policy))
- QueryPolicy(ZX_POL_BAD_HANDLE);
+ QueryBasicPolicy(ZX_POL_BAD_HANDLE);
return nullptr;
}
@@ -777,7 +777,7 @@
return ZX_OK;
}
-zx_status_t ProcessDispatcher::QueryPolicy(uint32_t condition) const {
+zx_status_t ProcessDispatcher::QueryBasicPolicy(uint32_t condition) const {
auto action = policy_.QueryBasicPolicy(condition);
if (action & ZX_POL_ACTION_EXCEPTION) {
thread_signal_policy_exception();
diff --git a/kernel/syscalls/channel.cpp b/kernel/syscalls/channel.cpp
index 3b74734..8e2014d 100644
--- a/kernel/syscalls/channel.cpp
+++ b/kernel/syscalls/channel.cpp
@@ -56,7 +56,7 @@
return ZX_ERR_INVALID_ARGS;
auto up = ProcessDispatcher::GetCurrent();
- zx_status_t res = up->QueryPolicy(ZX_POL_NEW_CHANNEL);
+ zx_status_t res = up->QueryBasicPolicy(ZX_POL_NEW_CHANNEL);
if (res != ZX_OK)
return res;
diff --git a/kernel/syscalls/fifo.cpp b/kernel/syscalls/fifo.cpp
index d15de97..ba84403 100644
--- a/kernel/syscalls/fifo.cpp
+++ b/kernel/syscalls/fifo.cpp
@@ -27,7 +27,7 @@
zx_status_t sys_fifo_create(size_t count, size_t elemsize, uint32_t options,
user_out_handle* out0, user_out_handle* out1) {
auto up = ProcessDispatcher::GetCurrent();
- zx_status_t res = up->QueryPolicy(ZX_POL_NEW_FIFO);
+ zx_status_t res = up->QueryBasicPolicy(ZX_POL_NEW_FIFO);
if (res != ZX_OK)
return res;
diff --git a/kernel/syscalls/port.cpp b/kernel/syscalls/port.cpp
index 26337aa..96fb8bb 100644
--- a/kernel/syscalls/port.cpp
+++ b/kernel/syscalls/port.cpp
@@ -27,7 +27,7 @@
zx_status_t sys_port_create(uint32_t options, user_out_handle* out) {
LTRACEF("options %u\n", options);
auto up = ProcessDispatcher::GetCurrent();
- zx_status_t result = up->QueryPolicy(ZX_POL_NEW_PORT);
+ zx_status_t result = up->QueryBasicPolicy(ZX_POL_NEW_PORT);
if (result != ZX_OK)
return result;
diff --git a/kernel/syscalls/socket.cpp b/kernel/syscalls/socket.cpp
index ae414a0..364da1a 100644
--- a/kernel/syscalls/socket.cpp
+++ b/kernel/syscalls/socket.cpp
@@ -30,7 +30,7 @@
user_out_handle* out0,
user_out_handle* out1) {
auto up = ProcessDispatcher::GetCurrent();
- zx_status_t res = up->QueryPolicy(ZX_POL_NEW_SOCKET);
+ zx_status_t res = up->QueryBasicPolicy(ZX_POL_NEW_SOCKET);
if (res != ZX_OK)
return res;
diff --git a/kernel/syscalls/task.cpp b/kernel/syscalls/task.cpp
index c515c6e..a81adf7 100644
--- a/kernel/syscalls/task.cpp
+++ b/kernel/syscalls/task.cpp
@@ -337,7 +337,7 @@
// We check the policy against the process calling zx_process_create, which
// is the operative policy, rather than against |job_handle|. Access to
// |job_handle| is controlled by the rights associated with the handle.
- zx_status_t result = up->QueryPolicy(ZX_POL_NEW_PROCESS);
+ zx_status_t result = up->QueryBasicPolicy(ZX_POL_NEW_PROCESS);
if (result != ZX_OK)
return result;
@@ -688,5 +688,5 @@
if (status != ZX_OK)
return status;
- return job->SetPolicy(options, policy.get(), policy.size());
+ return job->SetBasicPolicy(options, policy.get(), policy.size());
}
diff --git a/kernel/syscalls/timer.cpp b/kernel/syscalls/timer.cpp
index 741442d..fe8b8f1 100644
--- a/kernel/syscalls/timer.cpp
+++ b/kernel/syscalls/timer.cpp
@@ -28,7 +28,7 @@
return ZX_ERR_INVALID_ARGS;
auto up = ProcessDispatcher::GetCurrent();
- zx_status_t result = up->QueryPolicy(ZX_POL_NEW_TIMER);
+ zx_status_t result = up->QueryBasicPolicy(ZX_POL_NEW_TIMER);
if (result != ZX_OK)
return result;
diff --git a/kernel/syscalls/vmo.cpp b/kernel/syscalls/vmo.cpp
index a23cdc6..29117b8 100644
--- a/kernel/syscalls/vmo.cpp
+++ b/kernel/syscalls/vmo.cpp
@@ -49,7 +49,7 @@
}
auto up = ProcessDispatcher::GetCurrent();
- zx_status_t res = up->QueryPolicy(ZX_POL_NEW_VMO);
+ zx_status_t res = up->QueryBasicPolicy(ZX_POL_NEW_VMO);
if (res != ZX_OK)
return res;
diff --git a/kernel/syscalls/zircon.cpp b/kernel/syscalls/zircon.cpp
index d081f46..ec078ae 100644
--- a/kernel/syscalls/zircon.cpp
+++ b/kernel/syscalls/zircon.cpp
@@ -128,7 +128,7 @@
return ZX_ERR_INVALID_ARGS;
auto up = ProcessDispatcher::GetCurrent();
- zx_status_t res = up->QueryPolicy(ZX_POL_NEW_EVENT);
+ zx_status_t res = up->QueryBasicPolicy(ZX_POL_NEW_EVENT);
if (res != ZX_OK)
return res;
@@ -149,7 +149,7 @@
return ZX_ERR_NOT_SUPPORTED;
auto up = ProcessDispatcher::GetCurrent();
- zx_status_t res = up->QueryPolicy(ZX_POL_NEW_EVENTPAIR);
+ zx_status_t res = up->QueryBasicPolicy(ZX_POL_NEW_EVENTPAIR);
if (res != ZX_OK)
return res;
