fec7918eea
* If < 0, it's an OPAL_ERR_* value * If >= 0, it's the actual output value of the function This is problematic for the OPAL_SOS stuff. This commit changes those functions to always return OPAL_* statuses and send the output value back through output parameters (like 95% of the rest of the code base). This avoids the confusion with OPAL_SOS stuff and makes paffinity work again (e.g., mpirun --bind-to-core ...). I updated all paffinitiy modules for the new function signatures, and bumped the paffinity API version up to 2.0.1. I don't think the version change will matter, though, because we'll be introducing support for hardware threads soon, which will either bump the paffinity version again or we'll replace paffinity with a new framework. This commit was SVN r23197.
179 строки
5.3 KiB
C
179 строки
5.3 KiB
C
/*
|
|
* Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana
|
|
* University Research and Technology
|
|
* Corporation. All rights reserved.
|
|
* Copyright (c) 2004-2006 The University of Tennessee and The University
|
|
* of Tennessee Research Foundation. All rights
|
|
* reserved.
|
|
* Copyright (c) 2004-2008 High Performance Computing Center Stuttgart,
|
|
* University of Stuttgart. All rights reserved.
|
|
* Copyright (c) 2004-2005 The Regents of the University of California.
|
|
* All rights reserved.
|
|
* Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
|
|
* $COPYRIGHT$
|
|
*
|
|
* Additional copyrights may follow
|
|
*
|
|
* $HEADER$
|
|
*/
|
|
|
|
#include "opal_config.h"
|
|
|
|
#include "opal/constants.h"
|
|
#include "opal/mca/base/mca_base_param.h"
|
|
#include "opal/mca/paffinity/paffinity.h"
|
|
#include "opal/mca/paffinity/base/base.h"
|
|
#include "paffinity_windows.h"
|
|
|
|
/*
|
|
* Local functions
|
|
*/
|
|
static int windows_module_init(void);
|
|
static int windows_module_finalize(void);
|
|
static int windows_module_get_num_procs(int *num_procs);
|
|
static int windows_module_set(opal_paffinity_base_cpu_set_t cpumask);
|
|
static int windows_module_get(opal_paffinity_base_cpu_set_t *cpumask);
|
|
static int windows_module_map_to_processor_id(int socket, int core, int *processor_id);
|
|
static int windows_module_map_to_socket_core(int processor_id, int *socket, int *core);
|
|
static int windows_module_get_processor_info(int *num_processors);
|
|
static int windows_module_get_socket_info(int *num_sockets);
|
|
static int windows_module_get_core_info(int socket, int *num_cores);
|
|
static int get_physical_processor_id(int logical_processor_id,
|
|
int *physical_processor_id);
|
|
static int get_physical_socket_id(int logical_socket_id,
|
|
int *physical_socket_id);
|
|
static int get_physical_core_id(int physical_socket_id, int logical_core_id,
|
|
int *physical_core_id);
|
|
|
|
static SYSTEM_INFO sys_info;
|
|
|
|
/*
|
|
* Windows paffinity module
|
|
*/
|
|
static const opal_paffinity_base_module_1_1_0_t loc_module = {
|
|
/* Initialization function */
|
|
windows_module_init,
|
|
|
|
/* Module function pointers */
|
|
windows_module_set,
|
|
windows_module_get,
|
|
windows_module_map_to_processor_id,
|
|
windows_module_map_to_socket_core,
|
|
windows_module_get_processor_info,
|
|
windows_module_get_socket_info,
|
|
windows_module_get_core_info,
|
|
get_physical_processor_id,
|
|
get_physical_socket_id,
|
|
get_physical_core_id,
|
|
windows_module_finalize
|
|
};
|
|
|
|
int opal_paffinity_windows_component_query(mca_base_module_t **module, int *priority)
|
|
{
|
|
int param;
|
|
|
|
param = mca_base_param_find("paffinity", "windows", "priority");
|
|
mca_base_param_lookup_int(param, priority);
|
|
|
|
*module = (mca_base_module_t *)&loc_module;
|
|
|
|
return OPAL_SUCCESS;
|
|
}
|
|
|
|
static int windows_module_finalize(void)
|
|
{
|
|
return OPAL_SUCCESS;
|
|
}
|
|
|
|
static int windows_module_init(void)
|
|
{
|
|
GetSystemInfo( &sys_info );
|
|
|
|
return OPAL_SUCCESS;
|
|
}
|
|
|
|
|
|
static int windows_module_get_num_procs(int *num_procs)
|
|
{
|
|
*num_procs = sys_info.dwNumberOfProcessors;
|
|
return OPAL_SUCCESS;
|
|
}
|
|
|
|
static int windows_module_set(opal_paffinity_base_cpu_set_t cpumask)
|
|
{
|
|
HANDLE threadid = GetCurrentThread();
|
|
DWORD_PTR process_mask, system_mask;
|
|
|
|
if( !GetProcessAffinityMask( threadid, &process_mask, &system_mask ) ) {
|
|
return OPAL_ERR_NOT_FOUND;
|
|
}
|
|
|
|
if( (int)(1 << cpumask.bitmask[0]) & (system_mask & 0xFFFFFFFF) ) {
|
|
process_mask = (int)(1 << cpumask.bitmask[0]);
|
|
if( SetThreadAffinityMask( threadid, process_mask ) )
|
|
return OPAL_SUCCESS;
|
|
/* otherwise something went wrong */
|
|
}
|
|
/* the specified processor is not enabled system wide */
|
|
return OPAL_ERR_NOT_FOUND;
|
|
}
|
|
|
|
|
|
static int windows_module_get(opal_paffinity_base_cpu_set_t *cpumask)
|
|
{
|
|
HANDLE threadid = GetCurrentThread();
|
|
DWORD_PTR process_mask, system_mask;
|
|
|
|
if( GetProcessAffinityMask( threadid, &process_mask, &system_mask ) ) {
|
|
cpumask->bitmask[0] = (opal_paffinity_base_bitmask_t)process_mask;
|
|
return OPAL_SUCCESS;
|
|
}
|
|
cpumask->bitmask[0] = 1;
|
|
return OPAL_ERR_BAD_PARAM;
|
|
}
|
|
|
|
static int windows_module_map_to_processor_id(int socket, int core, int *processor_id)
|
|
{
|
|
return OPAL_ERR_NOT_SUPPORTED;
|
|
}
|
|
|
|
static int windows_module_map_to_socket_core(int processor_id, int *socket, int *core)
|
|
{
|
|
return OPAL_ERR_NOT_SUPPORTED;
|
|
}
|
|
|
|
static int windows_module_get_processor_info(int *num_processors)
|
|
{
|
|
*num_processors = sys_info.dwNumberOfProcessors;
|
|
return OPAL_SUCCESS;
|
|
}
|
|
|
|
static int windows_module_get_socket_info(int *num_sockets)
|
|
{
|
|
return OPAL_ERR_NOT_SUPPORTED;
|
|
}
|
|
|
|
static int windows_module_get_core_info(int socket, int *num_cores)
|
|
{
|
|
return OPAL_ERR_NOT_SUPPORTED;
|
|
}
|
|
|
|
static int get_physical_processor_id(int logical_processor_id,
|
|
int *physical_processor_id)
|
|
{
|
|
return OPAL_ERR_NOT_SUPPORTED;
|
|
}
|
|
|
|
static int get_physical_socket_id(int logical_socket_id,
|
|
int *physical_socket_id)
|
|
{
|
|
return OPAL_ERR_NOT_SUPPORTED;
|
|
}
|
|
|
|
static int get_physical_core_id(int physical_socket_id, int logical_core_id,
|
|
int *physical_core_id)
|
|
{
|
|
return OPAL_ERR_NOT_SUPPORTED;
|
|
}
|
|
|