From 87bd23c55fce0487d1fa96abf94edd4a61b57b40 Mon Sep 17 00:00:00 2001 From: DamianX Date: Mon, 20 Jul 2020 11:23:59 +0200 Subject: [PATCH] removed atom del profiler (#27144) --- __DEFINES/global.dm | 3 --- code/game/atoms.dm | 17 ----------------- code/game/machinery/computer/HolodeckControl.dm | 1 - code/game/objects/effects/effect_system.dm | 1 - code/modules/admin/admin_verbs.dm | 1 - code/modules/admin/verbs/debug.dm | 14 -------------- code/modules/awaymissions/corpse.dm | 1 - code/modules/mob/hearing/virtualhearer.dm | 1 - .../mob/living/silicon/robot/robot_modules.dm | 3 +-- .../research/xenoarchaeology/finds/finds.dm | 1 - 10 files changed, 1 insertion(+), 42 deletions(-) diff --git a/__DEFINES/global.dm b/__DEFINES/global.dm index 43381c9983d..d44657fd657 100644 --- a/__DEFINES/global.dm +++ b/__DEFINES/global.dm @@ -45,9 +45,6 @@ var/global/list/deadmins = list() //List of vars that require DEBUG on top of VAREDIT to be able to edit var/list/lockedvars = list("vars", "client", "holder", "step_x", "step_y", "step_size") -// List of types and how many instances of each type there are. -var/list/type_instances = list() - /var/global/datum/map/active/map = new() //Current loaded map //Defined in its .dm, see maps/_map.dm for more info. diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 09a5168f944..674cb74ae9e 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -141,22 +141,6 @@ var/global/list/ghdel_profiling = list() var/mob/living/M = src M.take_organ_damage(10) -/atom/proc/AddToProfiler() - // Memory usage profiling - N3X. - ++type_instances[type] - -/atom/proc/DeleteFromProfiler() - // Memory usage profiling - N3X. - if (type in type_instances) - type_instances[type] = type_instances[type] - 1 - else - type_instances[type] = 0 - WARNING("Type [type] does not inherit /atom/New(). Please ensure ..() is called, or that the type calls AddToProfiler().") - -/atom/Del() - DeleteFromProfiler() - ..() - /atom/Destroy() if(reagents) qdel(reagents) @@ -184,7 +168,6 @@ var/global/list/ghdel_profiling = list() /atom/New() on_density_change = new("owner"=src) . = ..() - AddToProfiler() /atom/proc/assume_air(datum/gas_mixture/giver) return null diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index a2456373c76..6bdd0ba804c 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -570,7 +570,6 @@ return 0 /obj/item/weapon/holo/esword/New() - AddToProfiler() _color = pick("red","blue","green","purple") /obj/item/weapon/holo/esword/attack_self(mob/living/user as mob) diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm index c61ab7ccf05..1644b884747 100644 --- a/code/game/objects/effects/effect_system.dm +++ b/code/game/objects/effects/effect_system.dm @@ -763,7 +763,6 @@ steam.start() -- spawns the effect flick("[icon_state]-disolve", src) sleep(5) qdel(src) - AddToProfiler() /obj/effect/effect/foam/fire/process() if(--amount < 0) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 6406041012c..7236f36261a 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -177,7 +177,6 @@ var/list/admin_verbs_debug = list( /client/proc/restart_controller, /client/proc/enable_debug_verbs, /client/proc/callproc, - /client/proc/cmd_admin_dump_instances, // /vg/ /client/proc/cmd_admin_dump_machine_type_list, // /vg/ /client/proc/disable_bloodvirii, // /vg /client/proc/handle_paperwork, //this is completely experimental diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index e2621c4d3f2..2750989cf55 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -711,20 +711,6 @@ Pressure: [env.pressure]"} else alert("Invalid mob") - -/client/proc/cmd_admin_dump_instances() - set category = "Debug" - set name = "Dump Instance Counts" - set desc = "MEMORY PROFILING IS TOO HIGH TECH" - var/date_string = time2text(world.realtime, "YYYY-MM-DD") - var/F=file("data/logs/profiling/[date_string]_instances.csv") - fdel(F) - F << "Types,Number of Instances" - for(var/key in type_instances) - F << "[key],[type_instances[key]]" - - to_chat(usr, "Dumped to [F]") - /client/proc/cmd_admin_find_bad_blood_tracks() set category = "Debug" set name = "Find broken blood tracks" diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index 19059455a39..8549e6dc65e 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -39,7 +39,6 @@ var/toxin_dmg = 0 /obj/effect/landmark/corpse/New() - AddToProfiler() if(ticker) initialize() diff --git a/code/modules/mob/hearing/virtualhearer.dm b/code/modules/mob/hearing/virtualhearer.dm index 99d1467f3ec..06d4effbd1c 100644 --- a/code/modules/mob/hearing/virtualhearer.dm +++ b/code/modules/mob/hearing/virtualhearer.dm @@ -24,7 +24,6 @@ var/list/stationary_hearers = list( /obj/item/device/radio/intercom, ignoreinvert = 1 /mob/virtualhearer/New(atom/attachedto) - AddToProfiler() virtualhearers += src loc = get_turf(attachedto) attached = attachedto diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index ae8585fc93a..c0ecca9db73 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -79,7 +79,6 @@ /obj/item/weapon/robot_module/New(var/mob/living/silicon/robot/R) ..() add_languages(R) - AddToProfiler() if(default_modules) AddDefaultModules() UpdateModuleHolder(R) @@ -635,7 +634,7 @@ sensor_augs = list("Medical", "Disable") fix_modules() - + /obj/item/weapon/robot_module/starman name = "starman robot module" module_holder = "starman" diff --git a/code/modules/research/xenoarchaeology/finds/finds.dm b/code/modules/research/xenoarchaeology/finds/finds.dm index 07c085e4f9f..c77735cc6db 100644 --- a/code/modules/research/xenoarchaeology/finds/finds.dm +++ b/code/modules/research/xenoarchaeology/finds/finds.dm @@ -1036,7 +1036,6 @@ /obj/item/weapon/archaeological_find/New(loc, var/new_item_type) ..() - AddToProfiler() if(new_item_type) find_type = new_item_type else