From 3611964b17ada62a51bd02dabd7876fd11d715c7 Mon Sep 17 00:00:00 2001 From: akvlad Date: Wed, 21 Aug 2024 20:43:04 +0300 Subject: [PATCH] fix rust library bug --- pyroscope/pprof-bin/pkg/pprof_bin_bg.wasm | Bin 225243 -> 225258 bytes pyroscope/pprof-bin/src/lib.rs | 5 +++++ pyroscope/pprof.js | 3 --- pyroscope/pyroscope.js | 1 - pyroscope/select_series.js | 1 - 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pyroscope/pprof-bin/pkg/pprof_bin_bg.wasm b/pyroscope/pprof-bin/pkg/pprof_bin_bg.wasm index a110fa20b1bcf70162a8c29840339d66ce3b1f53..6380006b4212600682e3b878038e4d8b20ecde61 100644 GIT binary patch delta 2230 zcmZwIOGs2<6bJA#w+Yf35z=1x>Z)mJsaa;3HDg*tZh{DvHZBSkaVU%yl^4-yK*(sU z+0?=)Fp!cYrdotWln~Lw9*crm2pY8stW84nKgFH<_oKzky}xt5b06pXzL`&nz}G}z z?6Kb$9e?8g{j>0k-&)+W#Ib@_Fi%2x9ifrF2}wWF5D>7mqu7#$fG_&)*O1R2ZJ!VI zjn2nM=Y6x&6-^>ijL(=aT~cvu#%F`!&E%HY(}b1pTtFzF!h?n{!P%4_#rb-}E6BHT zUSfC^c?{>9JUj9h*y08Lx{y4D^Pu4h!$ss7oU^~dt115-=UyKik!J{Or2*=VhPgxH z6Um@_8cc5_h450!AB1i40XWMw?k|l9tich7;n&lPT%=_NJr@@l5hr!+mfL<!WU=hApJZ&dXj%6Ay!)imA_4RApg z%o{5kuA&R(z}4hj*e2U>jp5`zK)e8XZy{h}G@vsV?ruAJf(lCz=OtDS^Mh5wyh5tr zom8*hPu>RaGTey!CpTj?2CO94!n~=1|8a=MhmhZ4xQ<+hJWrk4;Wyli056?=Ft6z! zSS$R-BQWoQTZZq#G}kh2c*epWx9JH#$LeRS8Yhl%9KH|N(=avvSv)YtKZLpSYMbgG z!Sv%G>M}3y$QuNBvrihHfceF*!o0Vy!TH_=wEAVwpVXUF9P~I?p{!>|7x!L hugqDQp@WIn+Br)Dc-#QTw2V$_dDmF_i^sMGvDU3zszS( zPG|atre-pK|IGcAsaFlIHo7UG!j;|STD4@W(XYR5_%cQ>B*R)aMH9(*BI#RRtZ7q9 zmE$w%%TZZ4M)28Txt81>`!KJA<_bbV3XfR63KvuUF3z`G-blWO^9suauuyYoHtpnv0O%8z&U#fE~NZ-oO^vRN=+lMhX#muTILQVk;|pL-0!29Dkea=EfM>H1mbd8d?eFM0UESf%@>#_BVFzGte-z$F*Byg* zk^tThk0WazXH& z2zJQDaL96MA0S?WytfcAF%poO>+L_;)klS;i1QMwfce3yU|u0La0AtgkCAKP1D0EH z|I}uz!+?BpJ{xs8-Bwu0=#sZVP4ZeuvYkuCt%(KcPu}I zX|B~H%L^KN+@UA@7;9V7A@dmHI6MU(reR|Kvv^{Se+qNw#SYa!gXzaXiL1T5QLhl- z&HmhS0_GQw!MwL`!a?tX>N?CbBj)@yG}_zq8D`|sbk z6P6CMWy!ccfxJAZ>oZn;pH(mB`tx`W$E$bL00Qzm?p{zV|7xyHZ2gMP3rDT+FdU#^ VW3X&ux9k=iA>WR7t?0`Ge*h`f_d5Up diff --git a/pyroscope/pprof-bin/src/lib.rs b/pyroscope/pprof-bin/src/lib.rs index e3985831..c07523a7 100644 --- a/pyroscope/pprof-bin/src/lib.rs +++ b/pyroscope/pprof-bin/src/lib.rs @@ -23,6 +23,8 @@ use std::vec::Vec; use wasm_bindgen::prelude::*; use std::sync::Arc; +//TODO: REMOVE +use std::fs; pub mod pprof_pb { @@ -80,6 +82,9 @@ struct Tree { impl Tree { pub fn total(&self) -> i64 { let mut total: i64 = 0; + if !self.nodes.contains_key(&0) { + return 0 as i64; + } for c in 0..self.nodes.get(&0).unwrap().len() { let _c = &self.nodes.get(&0).unwrap()[c]; total += _c.total[0]; diff --git a/pyroscope/pprof.js b/pyroscope/pprof.js index e261d79e..144e3f3d 100644 --- a/pyroscope/pprof.js +++ b/pyroscope/pprof.js @@ -136,7 +136,6 @@ const bfs = (t) => { * @param {string} sampleType */ const createFlameGraph = (pprofBinaries, sampleType) => { - console.log(`got ${pprofBinaries.length} profiles`) const tree = new Tree() tree.sampleType = sampleType let start = Date.now() @@ -144,10 +143,8 @@ const createFlameGraph = (pprofBinaries, sampleType) => { const prof = messages.Profile.deserializeBinary(p) tree.merge(prof) } - console.log(`ds + merge took ${Date.now() - start} ms`) start = Date.now() const levels = bfs(tree) - console.log(`bfs took ${Date.now() - start} ms`) return { levels: levels, names: tree.names, total: parseInt(tree.root.total), maxSelf: parseInt(tree.maxSelf) } } diff --git a/pyroscope/pyroscope.js b/pyroscope/pyroscope.js index f979e10a..57609adc 100644 --- a/pyroscope/pyroscope.js +++ b/pyroscope/pyroscope.js @@ -402,7 +402,6 @@ const analyzeQuery = async (req, res) => { const toTimeSec = Math.floor(req.getEnd && req.getEnd() ? parseInt(req.getEnd()) / 1000 : Date.now() / 1000) - console.log(query) const scope = new messages.QueryScope() scope.setComponentType('store') diff --git a/pyroscope/select_series.js b/pyroscope/select_series.js index 0f406654..f25db50c 100644 --- a/pyroscope/select_series.js +++ b/pyroscope/select_series.js @@ -133,7 +133,6 @@ const selectSeriesImpl = async (fromTimeSec, toTimeSec, payload) => { const resp = new messages.SelectSeriesResponse() resp.setSeriesList(seriesList) - console.log(`Queried ${seriesList.length} series`) return resp }