mawei/StarPilot
1
0
Fork 0
mirror of https://github.com/firestar5683/StarPilot.git synced 2026-07-01 19:42:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

loggerd: check userFlag outside the while loop (#29095)

Browse Source 
* improve check userFlag

* rename to ServiceState

* setxattr once
old-commit-hash: c0c00e1997a6919701a183b9d4757a74b17ac141
This commit is contained in:
Dean Lee
2023-07-24 03:33:06 +08:00
committed by GitHub
parent fe6b4d26f3
commit c4aeaba7c6
1 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/loggerd/loggerd.cc
+20 -16
View File
@@ -173,6 +173,9 @@ int handle_encoder_msg(LoggerdState *s, Message *msg, std::string &name, struct
}
void handle_user_flag(LoggerdState *s) {
static int prev_segment = -1;
if (s->rotate_segment == prev_segment) return;
LOGW("preserving %s", s->segment_path);
#ifdef __APPLE__
@@ -183,16 +186,17 @@ void handle_user_flag(LoggerdState *s) {
if (ret) {
LOGE("setxattr %s failed for %s: %s", PRESERVE_ATTR_NAME, s->segment_path, strerror(errno));
}
prev_segment = s->rotate_segment.load();
}
void loggerd_thread() {
// setup messaging
typedef struct QlogState {
typedef struct ServiceState {
std::string name;
int counter, freq;
bool encoder;
} QlogState;
std::unordered_map<SubSocket*, QlogState> qlog_states;
bool encoder, user_flag;
} ServiceState;
std::unordered_map<SubSocket*, ServiceState> service_state;
std::unordered_map<SubSocket*, struct RemoteEncoder> remote_encoders;
std::unique_ptr<Context> ctx(Context::create());
@@ -207,11 +211,12 @@ void loggerd_thread() {
SubSocket * sock = SubSocket::create(ctx.get(), it.name);
assert(sock != NULL);
poller->registerSocket(sock);
qlog_states[sock] = {
service_state[sock] = {
.name = it.name,
.counter = 0,
.freq = it.decimation,
.encoder = encoder,
.user_flag = (strcmp(it.name, "userFlag") == 0),
};
}
@@ -236,20 +241,19 @@ void loggerd_thread() {
for (auto sock : poller->poll(1000)) {
if (do_exit) break;
ServiceState &service = service_state[sock];
if (service.user_flag) {
handle_user_flag(&s);
}
// drain socket
int count = 0;
QlogState &qs = qlog_states[sock];
Message *msg = nullptr;
while (!do_exit && (msg = sock->receive(true))) {
const bool in_qlog = qs.freq != -1 && (qs.counter++ % qs.freq == 0);
if (qs.name == "userFlag") {
handle_user_flag(&s);
}
if (qs.encoder) {
const bool in_qlog = service.freq != -1 && (service.counter++ % service.freq == 0);
if (service.encoder) {
s.last_camera_seen_tms = millis_since_boot();
bytes_count += handle_encoder_msg(&s, msg, qs.name, remote_encoders[sock], encoder_infos_dict[qs.name]);
bytes_count += handle_encoder_msg(&s, msg, service.name, remote_encoders[sock], encoder_infos_dict[service.name]);
} else {
logger_log(&s.logger, (uint8_t *)msg->getData(), msg->getSize(), in_qlog);
bytes_count += msg->getSize();
@@ -265,7 +269,7 @@ void loggerd_thread() {
count++;
if (count >= 200) {
LOGD("large volume of '%s' messages", qs.name.c_str());
LOGD("large volume of '%s' messages", service.name.c_str());
break;
}
}
@@ -282,7 +286,7 @@ void loggerd_thread() {
}
// messaging cleanup
for (auto &[sock, qs] : qlog_states) delete sock;
for (auto &[sock, service] : service_state) delete sock;
}
int main(int argc, char** argv) {