Merge branch 'dev' of github.com:zerotier/ZeroTierOne into dev

This commit is contained in:
Adam Ierymenko 2021-09-15 13:31:22 -04:00
commit e822463916
No known key found for this signature in database
GPG Key ID: C8877CF2D7A5D7F3

View File

@ -594,12 +594,14 @@ void PostgreSQL::initializeNetworks()
auto dur = std::chrono::duration_cast<std::chrono::microseconds>(end - start);;
total += dur.count();
++count;
if (count % 10000 == 0) {
if (count > 0 && count % 10000 == 0) {
fprintf(stderr, "Averaging %llu us per network\n", (total/count));
}
}
fprintf(stderr, "Took %llu us per network to load\n", (total/count));
if (count > 0) {
fprintf(stderr, "Took %llu us per network to load\n", (total/count));
}
stream.complete();
w.commit();
@ -748,11 +750,13 @@ void PostgreSQL::initializeMembers()
auto dur = std::chrono::duration_cast<std::chrono::microseconds>(end - start);;
total += dur.count();
++count;
if (count % 10000 == 0) {
if (count > 0 && count % 10000 == 0) {
fprintf(stderr, "Averaging %llu us per member\n", (total/count));
}
}
fprintf(stderr, "Took %llu us per member to load\n", (total/count));
if (count > 0) {
fprintf(stderr, "Took %llu us per member to load\n", (total/count));
}
stream.complete();