Fix Linux CE.
GitOrigin-RevId: 7758d3fe4cc16210338f739e2dcc748d55e808a5
This commit is contained in:
parent
07237a18be
commit
d46fa34869
@ -112,7 +112,7 @@ void Epoll::run(int timeout_ms) {
|
|||||||
flags = flags | PollFlags::Error();
|
flags = flags | PollFlags::Error();
|
||||||
}
|
}
|
||||||
if (event->events) {
|
if (event->events) {
|
||||||
LOG(FATAL) << "Unsupported epoll events: " << event->events;
|
LOG(FATAL) << "Unsupported epoll events: " << static_cast<int32>(event->events);
|
||||||
}
|
}
|
||||||
//LOG(DEBUG) << "Epoll event " << tag("fd", event->data.fd) << tag("flags", format::as_binary(flags));
|
//LOG(DEBUG) << "Epoll event " << tag("fd", event->data.fd) << tag("flags", format::as_binary(flags));
|
||||||
auto pollable_fd = PollableFd::from_list_node(static_cast<ListNode *>(event->data.ptr));
|
auto pollable_fd = PollableFd::from_list_node(static_cast<ListNode *>(event->data.ptr));
|
||||||
|
@ -77,7 +77,7 @@ void EventFdBsd::release() {
|
|||||||
}
|
}
|
||||||
size_t size = result.ok();
|
size_t size = result.ok();
|
||||||
if (size != sizeof(value)) {
|
if (size != sizeof(value)) {
|
||||||
LOG(FATAL) << "EventFdBsd write returned " << value << " instead of " << sizeof(value);
|
LOG(FATAL) << "EventFdBsd write returned " << size << " instead of " << sizeof(value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -16,6 +16,8 @@
|
|||||||
|
|
||||||
#if TD_PORT_POSIX
|
#if TD_PORT_POSIX
|
||||||
|
|
||||||
|
#include <cstring>
|
||||||
|
|
||||||
#if TD_ANDROID
|
#if TD_ANDROID
|
||||||
#include <sys/system_properties.h>
|
#include <sys/system_properties.h>
|
||||||
#else
|
#else
|
||||||
@ -99,7 +101,8 @@ Slice get_operating_system_version() {
|
|||||||
utsname name;
|
utsname name;
|
||||||
int err = uname(&name);
|
int err = uname(&name);
|
||||||
if (err == 0) {
|
if (err == 0) {
|
||||||
auto os_name = trim(PSTRING() << name.sysname << " " << name.release);
|
auto os_name = trim(PSTRING() << Slice(name.sysname, std::strlen(name.sysname)) << " "
|
||||||
|
<< Slice(name.release, std::strlen(name.release)));
|
||||||
if (!os_name.empty()) {
|
if (!os_name.empty()) {
|
||||||
return os_name;
|
return os_name;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user