Changeset 484122


Ignore:
Timestamp:
01/13/10 15:30:35 (8 years ago)
Author:
Jayesh Krishna <jayesh@…>
Branches:
master, 3.1.x, 3.2.x
Children:
1ec467
Parents:
adba14
Message:

[svn-r6118] Adding options to SMPD to recognize MS HPC job manager

Location:
src/pm/smpd
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • src/pm/smpd/Makefile.sm

    rcd4db7 r484122  
    66 smpd_handle_command.c smpd_session.c smpd_start_mgr.c smpd_barrier.c \ 
    77 smpd_do_console.c smpd_restart.c smpd_host_util.c smpd_handle_spawn.c 
    8 win_sources = smpd_job.c smpd_mapdrive.c smpd_register.c smpd_ad.cpp smpd_affinitize.c 
     8win_sources = smpd_job.c smpd_mapdrive.c smpd_register.c smpd_ad.cpp smpd_affinitize.c smpd_ccp_util.c 
    99#mpiexec_SOURCES = mpiexec.c mp_parse_command_line.c 
    1010#smpd_SOURCES = smpd.c smpd_cmd_args.c smpd_watchprocs.c 
  • src/pm/smpd/mp_parse_command_line.c

    rf4b999 r484122  
    15311531                smpd_add_host_to_default_list((*argvp)[2]); 
    15321532            } 
     1533        else if (strcmp(&(*argvp)[1][1], "ccp") == 0) 
     1534        { 
     1535            result = smpd_get_ccp_nodes(&nproc, &host_list); 
     1536            if(result != SMPD_SUCCESS) 
     1537            { 
     1538                printf("Error: Unable to get the list of nodes from job manager \n"); 
     1539                smpd_exit_fn(FCNAME); 
     1540                return SMPD_FAIL; 
     1541            } 
     1542            num_args_to_strip = 1; 
     1543        } 
    15331544            else if (strcmp(&(*argvp)[1][1], "hosts") == 0) 
    15341545            { 
     
    21162127        } 
    21172128 
     2129    smpd_dbg_printf("Processing environment variables \n"); 
    21182130        /* add environment variables */ 
    21192131        env_data[0] = '\0'; 
     
    21512163        } 
    21522164 
     2165    smpd_dbg_printf("Processing drive mappings\n"); 
    21532166        /* merge global drive mappings with the local drive mappings */ 
    21542167        gmap_node = gdrive_map_list; 
     
    22002213        } 
    22012214 
     2215    smpd_dbg_printf("Creating launch nodes (%d)\n", nproc); 
    22022216        for (i=0; i<nproc; i++) 
    22032217        { 
     
    22122226            launch_node->clique[0] = '\0'; 
    22132227            smpd_get_next_host(&host_list, launch_node); 
     2228        smpd_dbg_printf("Adding host (%s) to launch list \n", launch_node->hostname); 
    22142229            launch_node->iproc = cur_rank++; 
    22152230#ifdef HAVE_WINDOWS_H 
  • src/pm/smpd/smpd.h

    rf4b999 r484122  
    229229#define SMPD_ERR_SETPRINTANDJUMP(msg, errcode) {smpd_err_printf("%s", msg); retval = errcode; goto fn_fail; } 
    230230#define SMPD_MAX_ERR_MSG_LENGTH 100 
     231 
    231232typedef enum smpd_state_t 
    232233{ 
     
    976977SMPD_BOOL smpd_isnumbers_with_colon(const char *str); 
    977978int smpd_add_host_to_default_list(const char *hostname); 
     979int smpd_get_ccp_nodes(int *np, smpd_host_node_t **host_node_ptr_p); 
    978980int smpd_add_extended_host_to_default_list(const char *hostname, const char *alt_hostname, const int num_cpus); 
    979981int smpd_parse_map_string(const char *str, smpd_map_drive_node_t **list); 
  • src/pm/smpd/smpd_util.vcproj

    rdb3cc49 r484122  
    10341034                        </File> 
    10351035                        <File 
     1036                                RelativePath=".\smpd_ccp_util.c" 
     1037                                > 
     1038                        </File> 
     1039                        <File 
    10361040                                RelativePath="smpd_command.c" 
    10371041                                > 
Note: See TracChangeset for help on using the changeset viewer.