Skip to content

Commit 86de53a

Browse files
committed
Minor tweaks.
1 parent 45e885c commit 86de53a

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ stringparsingcheck:tests/stringparsingcheck.cpp $(HEADERS) $(LIBFILES)
113113
$(CXX) $(CXXFLAGS) -o stringparsingcheck tests/stringparsingcheck.cpp src/jsonioutil.cpp src/jsonparser.cpp src/stage1_find_marks.cpp -I. $(LIBFLAGS) -DJSON_TEST_STRINGS
114114

115115

116-
minifiercompetition: benchmark/minifiercompetition.cpp $(HEADERS) $(MINIFIERHEADERS) $(LIBFILES) $(MINIFIERLIBFILES)
116+
minifiercompetition: benchmark/minifiercompetition.cpp $(HEADERS) $(LIBS) $(MINIFIERHEADERS) $(LIBFILES) $(MINIFIERLIBFILES)
117117
$(CXX) $(CXXFLAGS) -o minifiercompetition $(LIBFILES) $(MINIFIERLIBFILES) benchmark/minifiercompetition.cpp -I. $(LIBFLAGS) $(COREDEPSINCLUDE)
118118

119119
minify: tools/minify.cpp $(HEADERS) $(MINIFIERHEADERS) $(LIBFILES) $(MINIFIERLIBFILES)

benchmark/linux/linux-perf-events.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616

1717
template <int TYPE = PERF_TYPE_HARDWARE> class LinuxEvents {
1818
int fd;
19+
bool working;
1920
perf_event_attr attribs;
2021
int num_events;
2122
std::vector<uint64_t> temp_result_vec;
2223
std::vector<uint64_t> ids;
23-
2424
public:
25-
explicit LinuxEvents(std::vector<int> config_vec) : fd(0) {
25+
explicit LinuxEvents(std::vector<int> config_vec) : fd(0), working(true) {
2626
memset(&attribs, 0, sizeof(attribs));
2727
attribs.type = TYPE;
2828
attribs.size = sizeof(attribs);
@@ -83,7 +83,8 @@ template <int TYPE = PERF_TYPE_HARDWARE> class LinuxEvents {
8383

8484
private:
8585
void report_error(const std::string &context) {
86-
throw std::runtime_error(context + ": " + std::string(strerror(errno)));
86+
if(working) std::cerr << (context + ": " + std::string(strerror(errno))) << std::endl;
87+
working = false;
8788
}
8889
};
8990
#endif

0 commit comments

Comments
 (0)