Update of /cvsroot/wpdev/xmlscripts/scripts/wolfpack
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16874/wolfpack
Modified Files:
armorinfo.py properties.py utilities.py weaponinfo.py
Log Message:
I tried reducing more imports...
I also think this is starting to have a positive effect on memory usage...
I did some testing the other day and recorded a 5m leak per console reload.
# Before Cleanups From Initial Startup
# CONSOLE RELOAD
VRIT RES SHR SWAP DATA
95972 33m 19m 60m 91m
99.4m 38m 19m 90m 97m
104m 43m 19m 60m 102m
109m 48m 19m 60m 107m
114m 53m 19m 60m 112m
119m 58m 19m 60m 117m
124m 64m 19m 60m 122m
# After Cleanups From Initial Startup
# CONSOLE RELOAD
VRIT RES SHR SWAP DATA
94868 32m 19m 60m 90m
98.0m 37m 19m 60m 96m
102m 42m 19m 60m 100m
107m 46m 19m 60m 105m
112m 51m 19m 60m 110m
116m 56m 19m 60m 114m
121m 60m 19m 60m 119m
Overall it appears that the total memory used on startup
has decreased just a bit, and the amount of memory leaked
per reload seems to drop just slightly.
Index: armorinfo.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/armorinfo.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** armorinfo.py 9 Jun 2004 21:47:26 -0000 1.6
--- armorinfo.py 11 Jul 2004 02:47:25 -0000 1.7
***************
*** 1,4 ****
! from wolfpack.consts import *
ARMOR_RESNAME_BONI = {
--- 1,11 ----
! from wolfpack.consts import RESISTANCE_PHYSICAL, RESISTANCE_ENERGY, \
! RESISTANCE_COLD, RESISTANCE_POISON, RESISTANCE_FIRE, DAMAGE_ENERGY, \
! DAMAGE_COLD, DAMAGE_POISON, DAMAGE_FIRE, DAMAGEBONUS, SPEEDBONUS, \
! HITBONUS, DEFENSEBONUS, MINDAMAGE, MAXDAMAGE, SPEED, MISSSOUND, \
! HITSOUND, PROJECTILE, PROJECTILEHUE, AMMUNITION, REQSTR, REQDEX, REQINT, \
! LUCK, GOLDINCREASE, LOWERREQS, HITPOINTRATE, STAMINARATE, MANARATE, \
! SPELLDAMAGEBONUS, MATERIALPREFIX, SWING, REFLECTPHYSICAL, \
! DURABILITYBONUS, WEIGHTBONUS, DAMAGE_PHYSICAL
ARMOR_RESNAME_BONI = {
Index: weaponinfo.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/weaponinfo.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** weaponinfo.py 14 May 2004 14:40:37 -0000 1.5
--- weaponinfo.py 11 Jul 2004 02:47:25 -0000 1.6
***************
*** 1,4 ****
! from wolfpack.consts import *
WEAPON_RESNAME_BONI = {
--- 1,11 ----
! from wolfpack.consts import RESISTANCE_PHYSICAL, RESISTANCE_ENERGY, \
! RESISTANCE_COLD, RESISTANCE_POISON, RESISTANCE_FIRE, DAMAGE_ENERGY, \
! DAMAGE_COLD, DAMAGE_POISON, DAMAGE_FIRE, DAMAGEBONUS, SPEEDBONUS, \
! HITBONUS, DEFENSEBONUS, MINDAMAGE, MAXDAMAGE, SPEED, MISSSOUND, \
! HITSOUND, PROJECTILE, PROJECTILEHUE, AMMUNITION, REQSTR, REQDEX, REQINT, \
! LUCK, GOLDINCREASE, LOWERREQS, HITPOINTRATE, STAMINARATE, MANARATE, \
! SPELLDAMAGEBONUS, MATERIALPREFIX, SWING, REFLECTPHYSICAL, \
! DURABILITYBONUS, WEIGHTBONUS, DAMAGE_PHYSICAL
WEAPON_RESNAME_BONI = {
Index: properties.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/properties.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** properties.py 22 Jun 2004 12:05:29 -0000 1.4
--- properties.py 11 Jul 2004 02:47:25 -0000 1.5
***************
*** 1,7 ****
- from wolfpack.consts import *
from math import floor
from wolfpack import weaponinfo
from wolfpack import armorinfo
#
--- 1,17 ----
from math import floor
from wolfpack import weaponinfo
from wolfpack import armorinfo
+ from wolfpack.consts import RESISTANCE_PHYSICAL, RESISTANCE_ENERGY, \
+ RESISTANCE_COLD, RESISTANCE_POISON, RESISTANCE_FIRE, DAMAGE_PHYSICAL, \
+ DAMAGE_ENERGY, DAMAGE_COLD, DAMAGE_POISON, DAMAGE_FIRE, DAMAGEBONUS, \
+ SPEEDBONUS, HITBONUS, DEFENSEBONUS, MINDAMAGE, MAXDAMAGE, SPEED, MISSSOUND, \
+ HITSOUND, PROJECTILE, PROJECTILEHUE, AMMUNITION, REQSTR, REQDEX, REQINT, \
+ LUCK, GOLDINCREASE, LOWERREQS, HITPOINTRATE, STAMINARATE, MANARATE, \
+ SPELLDAMAGEBONUS, MATERIALPREFIX, SWING, REFLECTPHYSICAL, \
+ DURABILITYBONUS, WEIGHTBONUS, \
+ MAGICRESISTANCE, INSCRIPTION, LAYER_RIGHTHAND, LAYER_MOUNT, \
+ ITEM_ARMOR, ITEM_WEAPON, ITEM_SHIELD, ITEM_MELEE, ITEM_RANGED, \
+ ITEM_PIERCING, ITEM_SLASHING, ITEM_BASHING
#
***************
*** 221,225 ****
maxdamage = int(char.gettag('maxdamage'))
return (mindamage, maxdamage)
!
# Special treatment for fists.
if not weapon:
--- 231,235 ----
maxdamage = int(char.gettag('maxdamage'))
return (mindamage, maxdamage)
!
# Special treatment for fists.
if not weapon:
***************
*** 227,231 ****
if char.maxdamage != 0:
return (char.mindamage, char.maxdamage)
!
mindamage = char.strength / 28
maxdamage = mindamage + 7
--- 237,241 ----
if char.maxdamage != 0:
return (char.mindamage, char.maxdamage)
!
mindamage = char.strength / 28
maxdamage = mindamage + 7
***************
*** 236,240 ****
if not weapon and char.maxdamage != 0:
return (char.mindamage, char.maxdamage)
!
mindamage = fromitem(weapon, MINDAMAGE)
maxdamage = fromitem(weapon, MAXDAMAGE)
--- 246,250 ----
if not weapon and char.maxdamage != 0:
return (char.mindamage, char.maxdamage)
!
mindamage = fromitem(weapon, MINDAMAGE)
maxdamage = fromitem(weapon, MAXDAMAGE)
Index: utilities.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/utilities.py,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** utilities.py 9 Jul 2004 10:06:54 -0000 1.60
--- utilities.py 11 Jul 2004 02:47:25 -0000 1.61
***************
*** 16,23 ****
import wolfpack
from wolfpack import properties
- from wolfpack.consts import *
import random
import string
from types import *
"""
--- 16,23 ----
import wolfpack
from wolfpack import properties
import random
import string
from types import *
+ from wolfpack.consts import *
"""
|
