Skip to content

Commit b458dfe

Browse files
committed
fix ground truth algo
1 parent 51899a8 commit b458dfe

File tree

1 file changed

+29
-17
lines changed

1 file changed

+29
-17
lines changed

node/util/cache-ground-truth.js

Lines changed: 29 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ var traversePages = function () {
8181
pages: {
8282
tPages: 0,
8383
newPages: 0,
84+
missPages: 0,
8485
},
8586
},
8687
fileMem = {};
@@ -90,30 +91,29 @@ var traversePages = function () {
9091
var net = JSON.parse(
9192
fs.readFileSync(`${program.base}/${p}/network.json`, "utf8")
9293
);
93-
var trace = JSON.parse(
94-
fs.readFileSync(`${program.base}/${p}/trace.json`, "utf8")
95-
);
94+
// var trace = JSON.parse(
95+
// fs.readFileSync(`${program.base}/${p}/trace.json`, "utf8")
96+
// );
9697
var netObj = netParser.parseNetworkLogs(net);
97-
var execTimings = traceParser.getExecutionTimingsByURL(trace, net);
98+
// var execTimings = traceParser.getExecutionTimingsByURL(trace, net);
9899
var graph = new dag.Graph(netObj);
100+
var missOnPage = false;
99101
graph.createTransitiveEdges();
100102
var fetches = graph.transitiveEdges;
101103
summary.pages.tPages++;
102104
var jss = netObj.filter((n) => n.type && n.type.indexOf("script") != -1);
103105
for (var n of jss) {
104106
summary.all.totalScripts++;
105107
var key = n.url.split("?")[0];
106-
fetches[n.url] &&
107-
fetches[n.url].length &&
108-
summary.fetches.scriptsThatFetch++;
108+
var fCurr = fetches[n.url];
109+
fCurr && fCurr.length && summary.fetches.scriptsThatFetch++;
109110
var unseenFile = false;
110-
var timings = execTimings.get(n.url);
111+
// var timings = execTimings.get(n.url);
111112

112113
if (fileMem[key]) {
113114
var fPrev = fileMem[key]["fetches"];
114-
var fCurr = fetches[n.url],
115-
execFound = null;
116-
if (fCurr && fCurr.length) {
115+
var execFound = null;
116+
if (fCurr && fCurr.length && fPrev && fPrev.length) {
117117
execFound = sameFileFetches(fPrev, fCurr, 1);
118118
// localtotal++;
119119
if (execFound) {
@@ -134,15 +134,26 @@ var traversePages = function () {
134134
fCurr.sort()
135135
)}`
136136
);
137+
missOnPage = true;
137138
}
138139

139-
timings && (fileMem[key]["timings"] += addTimings(timings));
140+
// timings && (fileMem[key]["timings"] += addTimings(timings));
141+
} else if (fCurr && fCurr.length) {
142+
fileMem[key]["fetches"].push(fCurr);
143+
summary.fetches.fetchesDiff++;
144+
program.verbose &&
145+
console.log(
146+
`first time fetches for ${n.url}: ${JSON.stringify(
147+
fCurr.sort()
148+
)}`
149+
);
150+
summary.fetches.uniqueScriptsThatFetch++;
140151
}
141152
} else {
142153
summary.all.uniqueScripts++;
143154
unseenFile = true;
144155
fileMem[key] = {};
145-
fileMem[key]["timings"] = timings ? addTimings(timings) : 0;
156+
// fileMem[key]["timings"] = timings ? addTimings(timings) : 0;
146157
var f = (fileMem[key]["fetches"] = []),
147158
_f = fetches[n.url];
148159
_f && _f.length && f.push(_f);
@@ -155,16 +166,17 @@ var traversePages = function () {
155166
);
156167
}
157168
}
169+
if (missOnPage) summary.pages.missPages++;
158170
if (unseenFile) summary.pages.newPages++;
159171
// console.log(`per page fetch: ${localfetched} ${localtotal}`);
160172
} catch (e) {
161173
program.verbose && console.log(e);
162174
}
163175
}
164-
for (var f in fileMem) {
165-
console.log(`${f},${fileMem[f]["timings"]}`);
166-
}
167-
// console.log(JSON.stringify(summary, null, 2));
176+
// for (var f in fileMem) {
177+
// console.log(`${f},${fileMem[f]["timings"]}`);
178+
// }
179+
console.log(JSON.stringify(summary, null, 2));
168180
};
169181

170182
traversePages();

0 commit comments

Comments
 (0)