Changeset 2736

Show
Ignore:
Timestamp:
07/13/08 19:51:18 (4 months ago)
Author:
dhozac
Message:

Merge ionice patch (originally from anonc, updated for newer util-vserver by cehteh).

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/configure.ac

    r2714 r2736  
    5858ENSC_PATHPROG(VCONFIG,   vconfig,, [See http://www.candelatech.com/~greear/vlan.html; usually this tool is shipped in the 'vconfig' or 'vlan' package of your distribution]) 
    5959ENSC_PATHPROG(WGET,      wget) 
     60ENSC_PATHPROG(IONICE,    ionice) 
    6061ENSC_PATHPROG(FILE,      file,    [file]) 
    6162ENSC_PATHPROG(GZIP,      gzip,    [gzip]) 
  • trunk/lib/cflags-v13.c

    r2533 r2736  
    6666  DECL("prolific",      VC_VXF_PROLIFIC), 
    6767  DECL("igneg_nice",    VC_VXF_IGNEG_NICE), 
     68  DECL("igneg_ionice", VC_VXF_IGNEG_IONICE), 
    6869 
    6970    // Some pseudo flags 
  • trunk/lib/vserver.h

    r2732 r2736  
    196196 
    197197#define VC_VXF_IGNEG_NICE               (1ULL<<52) 
     198#define VC_VXF_IGNEG_IONICE             (1ULL<<53) 
    198199 
    199200 
  • trunk/scripts/util-vserver-vars.pathsubst

    r2692 r2736  
    154154_WC="@WC@" 
    155155_WGET="@WGET@" 
     156_IONICE="@IONICE@" 
    156157 
    157158# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=106057 
  • trunk/scripts/vserver.functions

    r2730 r2736  
    2121 
    2222declare -a NICE_CMD=() 
     23declare -a IONICE_CMD=() 
    2324declare -a CHBIND_CMD=() 
    2425declare -a CAP_OPTS=() 
     
    136137} 
    137138 
     139function _generateIONiceCommand 
     140{ 
     141    local vdir=$1 
     142    local ionice_class=2 
     143    local ionice_priority=0 
     144 
     145    test -r "$vdir/ionice/class" && read ionice_class <"$vdir"/ionice/class 
     146    test -r "$vdir/ionice/priority" && read ionice_priority <"$vdir"/ionice/priority 
     147 
     148    IONICE_CMD=( $_IONICE -c$ionice_class -n$ionice_priority ) 
     149} 
    138150 
    139151function _generatePersonalityOptions 
     
    813825    test -n "$_HAVE_CHBIND_OPTIONS" || _generateChbindOptions "$1"  
    814826    _generateNiceCommand        "$1" 
     827    _generateIONiceCommand      "$1" 
    815828    _generateInitOptions        "$1" 
    816829    _generateChcontextOptions   "$1" 
  • trunk/scripts/vserver.start

    r2735 r2736  
    134134is_configured=1 
    135135if $_VSERVER_INFO - FEATURE migrate; then 
     136    ${IONICE_CMD[@]} \ 
    136137    ${NICE_CMD[@]} \ 
    137138    "${CHBIND_CMD[@]}" \ 
     
    164165    fi 
    165166     
     167    ${IONICE_CMD[@]} \ 
    166168    ${NICE_CMD[@]} \ 
    167169    "${CHBIND_CMD[@]}" \ 
  • trunk/scripts/vserver.stop

    r2704 r2736  
    8181    fi 
    8282elif $_VSERVER_INFO - FEATURE migrate; then 
     83    "${IONICE_CMD[@]}" \ 
    8384    "${NICE_CMD[@]}" \ 
    8485    "${CHBIND_CMD[@]}" \ 
     
    8889    "${INITCMD_STOP[@]}" || fail=1 
    8990else 
     91    "${IONICE_CMD[@]}" \ 
    9092    "${NICE_CMD[@]}" \ 
    91     "$_CHBIND"       "${CHBIND_OPTS[@]}" \ 
     93    "${CHBIND_CMD[@]}" \ 
    9294    "$_EXEC_ULIMIT"  "$VSERVER_DIR/ulimits" \ 
    9395    $_CHCONTEXT_COMPAT    "${CHCONTEXT_OPTS[@]}" \ 
  • trunk/scripts/vserver.suexec

    r2669 r2736  
    3535    if test -z "$is_stopped"; then 
    3636        exec \ 
     37        "${IONICE_CMD[@]}" \ 
    3738        "${NICE_CMD[@]}" \ 
    3839        "${CHBIND_CMD[@]}" \ 
     
    4647    else 
    4748        exec \ 
     49        "${IONICE_CMD[@]}" \ 
    4850        "${NICE_CMD[@]}" \ 
    4951        "${CHBIND_CMD[@]}" \ 
     
    5860else 
    5961    exec \ 
     62    "${IONICE_CMD[@]}" \ 
    6063    "${NICE_CMD[@]}" \ 
    6164    "${CHBIND_CMD[@]}" \