Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-9319. Fix compilation issue of handling typedef an existing name by gcc compiler. (Zhankun Tang via wangda) 

Change-Id: Ie8293cc5b710ff355fb6a1ea7201be53ed0385bf
This commit is contained in:
Wangda Tan 2019-02-21 11:17:32 -08:00
parent 6c4ab0312b
commit b17a2602d1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/modules/devices/devices-module.c
View File

@ -82,7 +82,7 @@ cleanup:
} }
static int internal_handle_devices_request( static int internal_handle_devices_request(
update_cgroups_parameters_function update_cgroups_parameters_func_p, update_cgroups_param_function update_cgroups_parameters_func_p,
char** deny_devices_number_tokens, char** deny_devices_number_tokens,
char** allow_devices_number_tokens, char** allow_devices_number_tokens,
const char* container_id) { const char* container_id) {
@ -196,7 +196,7 @@ void reload_devices_configuration() {
* --allowed_devices 8:32,8:48,243:2 \ * --allowed_devices 8:32,8:48,243:2 \
* --container_id container_x_y * --container_id container_x_y
*/ */
int handle_devices_request(update_cgroups_parameters_function func, int handle_devices_request(update_cgroups_param_function func,
const char* module_name, int module_argc, char** module_argv) { const char* module_name, int module_argc, char** module_argv) {
if (!cfg_section) { if (!cfg_section) {
reload_devices_configuration(); reload_devices_configuration();

4
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/modules/devices/devices-module.h
View File

@ -28,13 +28,13 @@
#define DEVICES_MODULE_SECTION_NAME "devices" #define DEVICES_MODULE_SECTION_NAME "devices"
// For unit test stubbing // For unit test stubbing
typedef int (*update_cgroups_parameters_function)(const char*, const char*, typedef int (*update_cgroups_param_function)(const char*, const char*,
const char*, const char*); const char*, const char*);
/** /**
* Handle devices requests * Handle devices requests
*/ */
int handle_devices_request(update_cgroups_parameters_function func, int handle_devices_request(update_cgroups_param_function func,
const char* module_name, int module_argc, char** module_argv); const char* module_name, int module_argc, char** module_argv);
/** /**