sperf doesn't need the hack to explicitly run static constructors now

8f631222 · Austin Clements · Silas Boyd-Wickizer · 8e60785f · 8f631222 · 8f631222
--- a/kernel/main.cc
+++ b/kernel/main.cc
@@ -36,7 +36,6 @@ void initnet(void);
 void initsched(void);
 void initlockstat(void);
 void initwq(void);
-void initsperf(void);
 void initidle(void);
 void initcpprt(void);
 void initfutex(void);
@@ -149,7 +148,6 @@ cmain(u64 mbmagic, u64 mbaddr)
  initacpi();
  initseg();
-  initsperf();
  inittrap();
  initlapic();
  initcmdline();

--- a/kernel/sperf.cc
+++ b/kernel/sperf.cc
@@ -9,11 +9,3 @@ using namespace scopedperf;
 static tsc_ctr tsc;
 ctrgroup_chain<tsc_ctr> perfgroup(&tsc);
-// but xv6 doesn't run static constructors, so call them explicitly below..
-void
-initsperf()
-{
-  new (&tsc) tsc_ctr();
-  new (&perfgroup) ctrgroup_chain<tsc_ctr>(&tsc);
-}