OSDN > Finden Software > btop > SCM > git > system-metrics > Commit

btop
Fork

system-metrics: Commit

sdsad

--- a/lib/System/Metrics.xs

+++ b/lib/System/Metrics.xs

		@@ -28,6 +28,7 @@
28	28	#include <cstdlib>
29	29	#include <stdexcept>
30	30	#include "system_metrics.hxx"
	31	+#include "3rdparty/nonstd/span.hpp"
31	32
32	33	extern "C" {
33	34	#define NO_XSLOCKS

		@@ -69,26 +70,33 @@ extern "C" {
69	70	_we_caught = true; \
70	71	} \
71	72	if (SM_UNLIKELY(_we_caught)) { \
72		- dTHX; \
73		- croak("%s: %s", __func__, _we_txt); \
	73	+ SV *func_name = cv_name(cv, NULL, 0); \
	74	+ croak("%" SVf ": %s", SVfARG(func_name), _we_txt); \
74	75	} \
75	76	} while (0);
76	77
77	78
78	79	template<typename T> static inline void
79		-unpack_args(pTHX_ T &args_struct, SV **mark)
	80	+unpack_args(pTHX_ T &args_struct, CV* cv, SV **mark)
80	81	{
81	82	dSP; dAX; dITEMS;
82	83
83		- if (items%2==0)
84		- croak("uneven");
	84	+ if (SM_UNLIKELY(items % 2 == 0)) {
	85	+ SV *func_name = cv_name(cv, NULL, 0);
	86	+ croak(
	87	+ "%" SVf ": uneven number of arguments (expected a key-value list)",
	88	+ func_name
	89	+ );
	90	+ }
85	91
86		- for (size_t i = 1; items > (i + 1); i += 2) {
	92	+ for (I32 i = 1; items > (i + 1); i += 2) {
87	93	STRLEN len;
88	94	char *key = SvPV(ST(i), len);
89	95
90		- if (!args_struct.contains({key,len}))
91		- croak("uknown argument \"%s\"", key);
	96	+ if (!SM_UNLIKELY(args_struct.contains({key,len}))) {
	97	+ SV *func_name = cv_name(cv, NULL, 0);
	98	+ croak("%" SVf ": unknown argument \"%s\"", func_name, key);
	99	+ }
92	100
93	101	args_struct.at({key,len}) = ST(i+1);
94	102	}

		@@ -97,7 +105,7 @@ unpack_args(pTHX_ T &args_struct, SV **mark)
97	105	static inline AV *
98	106	deref_av(SV *rv) {
99	107	if(!SvROK(rv) \|\| (SvTYPE(SvRV(rv)) != SVt_PVAV)) {
100		- croak("expected arrayref");
	108	+ return nullptr;
101	109	}
102	110
103	111	return reinterpret_cast<AV*>(SvRV(rv));

		@@ -202,19 +210,30 @@ CODE:
202	210	SM_MAPIFY_STRUCT(SV*, fields)
203	211	} args;
204	212
205		- unpack_args(aTHX_ args, mark);
	213	+ unpack_args(aTHX_ args, cv, mark);
206	214
207	215	process_list_fields fields;
208	216	if (args.fields) {
209		- // FIXME: pusty arrayref!
210	217	AV *fields_arr = deref_av(args.fields);
	218	+ if(!fields_arr) {
	219	+ SV *func_name = cv_name(cv, NULL, 0);
	220	+ croak(
	221	+ "%" SVf ": \"fields\" must be an arrayref", SVfARG(func_name)
	222	+ );
	223	+ }
211	224
212	225	for (SSize_t i = 0; AvFILL(fields_arr) >= i; i++) {
213		- STRLEN len;
214		- char *key = SvPV(AvARRAY(fields_arr)[i], len);
215		-
216		- if (!fields.contains({key,len}))
217		- croak("Unknown field \"%s\"", key);
	226	+ SV field = av_fetch(fields_arr, i, 1);
	227	+ size_t len;
	228	+ char *key = SvPV(field, len);
	229	+
	230	+ if (!fields.contains({key,len})) {
	231	+ SV *func_name = cv_name(cv, NULL, 0);
	232	+ croak(
	233	+ "%" SVf ": unknown field \"%" SVf "\"", SVfARG(func_name),
	234	+ SVfARG(field)
	235	+ );
	236	+ }
218	237
219	238	fields.at({key,len}) = true;
220	239	}

		@@ -261,8 +280,7 @@ CODE:
261	280
262	281	#ifdef USE_ITHREADS
263	282	void
264		-CLONE(class_name, ...)
265		- char* class_name;
	283	+CLONE(char *class_name, ...)
266	284	CODE:
267	285	char buf[200];
268	286	snprintf(buf, sizeof(buf), "%s%s", class_name, "::__instances");