From: VMware, Inc <> Date: Thu, 18 Nov 2010 21:26:24 +0000 (-0800) Subject: lib/lock: code move before change X-Git-Tag: 2010.11.17-327185~72 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c432b96bce06f477a2d474c950fa9c084e61f7ff;p=thirdparty%2Fopen-vm-tools.git lib/lock: code move before change Signed-off-by: Marcelo Vanzin --- diff --git a/open-vm-tools/lib/lock/ulExcl.c b/open-vm-tools/lib/lock/ulExcl.c index 5bfdc03f9..1656a88cd 100644 --- a/open-vm-tools/lib/lock/ulExcl.c +++ b/open-vm-tools/lib/lock/ulExcl.c @@ -45,89 +45,6 @@ struct MXUserExclLock }; -/* - *----------------------------------------------------------------------------- - * - * MXUser_ControlExclLock -- - * - * Perform the specified command on the specified lock. - * - * Results: - * TRUE succeeded - * FALSE failed - * - * Side effects: - * Depends on the command, no? - * - *----------------------------------------------------------------------------- - */ - -Bool -MXUser_ControlExclLock(MXUserExclLock *lock, // IN/OUT: - uint32 command, // IN: - ...) // IN: -{ - Bool result; - - ASSERT(lock && (lock->header.signature == MXUSER_EXCL_SIGNATURE)); - - switch (command) { - case MXUSER_CONTROL_ACQUISITION_HISTO: { - MXUserStats *stats = (MXUserStats *) Atomic_ReadPtr(&lock->statsMem); - - if (stats) { - va_list a; - uint64 minValue; - uint32 decades; - - va_start(a, command); - minValue = va_arg(a, uint64); - decades = va_arg(a, uint32); - va_end(a); - - MXUserForceHisto(&stats->acquisitionHisto, - MXUSER_STAT_CLASS_ACQUISITION, minValue, decades); - - result = TRUE; - } else { - result = FALSE; - } - - break; - } - - case MXUSER_CONTROL_HELD_HISTO: { - MXUserStats *stats = (MXUserStats *) Atomic_ReadPtr(&lock->statsMem); - - if (stats) { - va_list a; - uint32 minValue; - uint32 decades; - - va_start(a, command); - minValue = va_arg(a, uint64); - decades = va_arg(a, uint32); - va_end(a); - - MXUserForceHisto(&stats->heldHisto, MXUSER_STAT_CLASS_HELD, - minValue, decades); - - result = TRUE; - } else { - result = FALSE; - } - - break; - } - - default: - result = FALSE; - } - - return result; -} - - /* *----------------------------------------------------------------------------- * @@ -233,6 +150,89 @@ MXUserDumpExclLock(MXUserHeader *header) // IN: } +/* + *----------------------------------------------------------------------------- + * + * MXUser_ControlExclLock -- + * + * Perform the specified command on the specified lock. + * + * Results: + * TRUE succeeded + * FALSE failed + * + * Side effects: + * Depends on the command, no? + * + *----------------------------------------------------------------------------- + */ + +Bool +MXUser_ControlExclLock(MXUserExclLock *lock, // IN/OUT: + uint32 command, // IN: + ...) // IN: +{ + Bool result; + + ASSERT(lock && (lock->header.signature == MXUSER_EXCL_SIGNATURE)); + + switch (command) { + case MXUSER_CONTROL_ACQUISITION_HISTO: { + MXUserStats *stats = (MXUserStats *) Atomic_ReadPtr(&lock->statsMem); + + if (stats) { + va_list a; + uint64 minValue; + uint32 decades; + + va_start(a, command); + minValue = va_arg(a, uint64); + decades = va_arg(a, uint32); + va_end(a); + + MXUserForceHisto(&stats->acquisitionHisto, + MXUSER_STAT_CLASS_ACQUISITION, minValue, decades); + + result = TRUE; + } else { + result = FALSE; + } + + break; + } + + case MXUSER_CONTROL_HELD_HISTO: { + MXUserStats *stats = (MXUserStats *) Atomic_ReadPtr(&lock->statsMem); + + if (stats) { + va_list a; + uint32 minValue; + uint32 decades; + + va_start(a, command); + minValue = va_arg(a, uint64); + decades = va_arg(a, uint32); + va_end(a); + + MXUserForceHisto(&stats->heldHisto, MXUSER_STAT_CLASS_HELD, + minValue, decades); + + result = TRUE; + } else { + result = FALSE; + } + + break; + } + + default: + result = FALSE; + } + + return result; +} + + /* *----------------------------------------------------------------------------- * diff --git a/open-vm-tools/lib/lock/ulRec.c b/open-vm-tools/lib/lock/ulRec.c index dd01d17e9..2eb39716c 100644 --- a/open-vm-tools/lib/lock/ulRec.c +++ b/open-vm-tools/lib/lock/ulRec.c @@ -58,86 +58,6 @@ struct MXUserRecLock }; -/* - *----------------------------------------------------------------------------- - * - * MXUser_ControlRecLock -- - * - * Perform the specified command on the specified lock. - * - * Results: - * TRUE succeeded - * FALSE failed - * - * Side effects: - * Depends on the command, no? - * - *----------------------------------------------------------------------------- - */ - -Bool -MXUser_ControlRecLock(MXUserRecLock *lock, // IN/OUT: - uint32 command, // IN: - ...) // IN: -{ - Bool result; - - ASSERT(lock && (lock->header.signature == MXUSER_REC_SIGNATURE)); - - switch (command) { - case MXUSER_CONTROL_ACQUISITION_HISTO: { - MXUserStats *stats = (MXUserStats *) Atomic_ReadPtr(&lock->statsMem); - - if (stats && (lock->vmmLock == NULL)) { - va_list a; - uint64 minValue; - uint32 decades; - va_start(a, command); - minValue = va_arg(a, uint64); - decades = va_arg(a, uint32); - va_end(a); - - MXUserForceHisto(&stats->acquisitionHisto, - MXUSER_STAT_CLASS_ACQUISITION, minValue, decades); - - result = TRUE; - } else { - result = FALSE; - } - break; - } - - case MXUSER_CONTROL_HELD_HISTO: { - MXUserStats *stats = (MXUserStats *) Atomic_ReadPtr(&lock->statsMem); - - if (stats && (lock->vmmLock == NULL)) { - va_list a; - uint64 minValue; - uint32 decades; - va_start(a, command); - minValue = va_arg(a, uint64); - decades = va_arg(a, uint32); - va_end(a); - - MXUserForceHisto(&stats->heldHisto, MXUSER_STAT_CLASS_HELD, - minValue, decades); - - result = TRUE; - } else { - result = FALSE; - } - - break; - } - - default: - result = FALSE; - } - - return result; -} - - /* *----------------------------------------------------------------------------- * @@ -255,6 +175,86 @@ MXUserDumpRecLock(MXUserHeader *header) // IN: } +/* + *----------------------------------------------------------------------------- + * + * MXUser_ControlRecLock -- + * + * Perform the specified command on the specified lock. + * + * Results: + * TRUE succeeded + * FALSE failed + * + * Side effects: + * Depends on the command, no? + * + *----------------------------------------------------------------------------- + */ + +Bool +MXUser_ControlRecLock(MXUserRecLock *lock, // IN/OUT: + uint32 command, // IN: + ...) // IN: +{ + Bool result; + + ASSERT(lock && (lock->header.signature == MXUSER_REC_SIGNATURE)); + + switch (command) { + case MXUSER_CONTROL_ACQUISITION_HISTO: { + MXUserStats *stats = (MXUserStats *) Atomic_ReadPtr(&lock->statsMem); + + if (stats && (lock->vmmLock == NULL)) { + va_list a; + uint64 minValue; + uint32 decades; + va_start(a, command); + minValue = va_arg(a, uint64); + decades = va_arg(a, uint32); + va_end(a); + + MXUserForceHisto(&stats->acquisitionHisto, + MXUSER_STAT_CLASS_ACQUISITION, minValue, decades); + + result = TRUE; + } else { + result = FALSE; + } + break; + } + + case MXUSER_CONTROL_HELD_HISTO: { + MXUserStats *stats = (MXUserStats *) Atomic_ReadPtr(&lock->statsMem); + + if (stats && (lock->vmmLock == NULL)) { + va_list a; + uint64 minValue; + uint32 decades; + va_start(a, command); + minValue = va_arg(a, uint64); + decades = va_arg(a, uint32); + va_end(a); + + MXUserForceHisto(&stats->heldHisto, MXUSER_STAT_CLASS_HELD, + minValue, decades); + + result = TRUE; + } else { + result = FALSE; + } + + break; + } + + default: + result = FALSE; + } + + return result; +} + + /* *----------------------------------------------------------------------------- *