@@ -680,14 +680,14 @@ static void PrintResourceUsage(JSONWriter* writer) {
680
680
writer->json_objectend ();
681
681
}
682
682
writer->json_objectend ();
683
- # ifdef RUSAGE_THREAD
684
- struct rusage stats ;
685
- if (getrusage (RUSAGE_THREAD, &stats ) == 0 ) {
683
+
684
+ uv_rusage_t t_stats ;
685
+ if (uv_getrusage_thread (&t_stats ) == 0 ) {
686
686
writer->json_objectstart (" uvthreadResourceUsage" );
687
687
double user_cpu =
688
- stats .ru_utime .tv_sec + SEC_PER_MICROS * stats .ru_utime .tv_usec ;
688
+ t_stats .ru_utime .tv_sec + SEC_PER_MICROS * t_stats .ru_utime .tv_usec ;
689
689
double kernel_cpu =
690
- stats .ru_stime .tv_sec + SEC_PER_MICROS * stats .ru_stime .tv_usec ;
690
+ t_stats .ru_stime .tv_sec + SEC_PER_MICROS * t_stats .ru_stime .tv_usec ;
691
691
writer->json_keyvalue (" userCpuSeconds" , user_cpu);
692
692
writer->json_keyvalue (" kernelCpuSeconds" , kernel_cpu);
693
693
double cpu_abs = user_cpu + kernel_cpu;
@@ -698,12 +698,12 @@ static void PrintResourceUsage(JSONWriter* writer) {
698
698
writer->json_keyvalue (" userCpuConsumptionPercent" , user_cpu_percentage);
699
699
writer->json_keyvalue (" kernelCpuConsumptionPercent" , kernel_cpu_percentage);
700
700
writer->json_objectstart (" fsActivity" );
701
- writer->json_keyvalue (" reads" , stats .ru_inblock );
702
- writer->json_keyvalue (" writes" , stats .ru_oublock );
701
+ writer->json_keyvalue (" reads" , t_stats .ru_inblock );
702
+ writer->json_keyvalue (" writes" , t_stats .ru_oublock );
703
703
writer->json_objectend ();
704
704
writer->json_objectend ();
705
705
}
706
- # endif // RUSAGE_THREAD
706
+
707
707
}
708
708
709
709
static void PrintEnvironmentVariables (JSONWriter* writer) {
0 commit comments