Notifications : Fix copy when the messages is spread across multiple os_mbuf.
This commit is contained in:
parent
cabf1168d4
commit
07b6812f61
5 changed files with 28 additions and 23 deletions
|
@ -105,18 +105,21 @@ int AlertNotificationClient::OnDescriptorDiscoveryEventCallback(uint16_t connect
|
||||||
|
|
||||||
void AlertNotificationClient::OnNotification(ble_gap_event *event) {
|
void AlertNotificationClient::OnNotification(ble_gap_event *event) {
|
||||||
if(event->notify_rx.attr_handle == newAlertHandle) {
|
if(event->notify_rx.attr_handle == newAlertHandle) {
|
||||||
static constexpr size_t stringTerminatorSize{1}; // end of string '\0'
|
constexpr size_t stringTerminatorSize = 1; // end of string '\0'
|
||||||
static constexpr size_t headerSize{3};
|
constexpr size_t headerSize = 3;
|
||||||
const auto maxMessageSize {NotificationManager::MaximumMessageSize()};
|
const auto maxMessageSize {NotificationManager::MaximumMessageSize()};
|
||||||
const auto maxBufferSize{maxMessageSize + headerSize};
|
const auto maxBufferSize{maxMessageSize + headerSize};
|
||||||
|
|
||||||
size_t bufferSize = min(OS_MBUF_PKTLEN(event->notify_rx.om) + stringTerminatorSize, maxBufferSize);
|
const auto dbgPacketLen = OS_MBUF_PKTLEN(event->notify_rx.om);
|
||||||
char *message = (char *)(&event->notify_rx.om[headerSize]);
|
size_t bufferSize = min(dbgPacketLen + stringTerminatorSize, maxBufferSize);
|
||||||
auto messageSize = min(maxMessageSize, (bufferSize-headerSize));
|
auto messageSize = min(maxMessageSize, (bufferSize-headerSize));
|
||||||
|
|
||||||
message[messageSize-1] = '\0';
|
NotificationManager::Notification notif;
|
||||||
|
os_mbuf_copydata(event->notify_rx.om, headerSize, messageSize-1, notif.message.data());
|
||||||
|
notif.message[messageSize-1] = '\0';
|
||||||
|
notif.category = Pinetime::Controllers::NotificationManager::Categories::SimpleAlert;
|
||||||
|
notificationManager.Push(std::move(notif));
|
||||||
|
|
||||||
notificationManager.Push(Pinetime::Controllers::NotificationManager::Categories::SimpleAlert, message, messageSize);
|
|
||||||
systemTask.PushMessage(Pinetime::System::SystemTask::Messages::OnNewNotification);
|
systemTask.PushMessage(Pinetime::System::SystemTask::Messages::OnNewNotification);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -54,18 +54,21 @@ AlertNotificationService::AlertNotificationService ( System::SystemTask& systemT
|
||||||
int AlertNotificationService::OnAlert(uint16_t conn_handle, uint16_t attr_handle,
|
int AlertNotificationService::OnAlert(uint16_t conn_handle, uint16_t attr_handle,
|
||||||
struct ble_gatt_access_ctxt *ctxt) {
|
struct ble_gatt_access_ctxt *ctxt) {
|
||||||
if (ctxt->op == BLE_GATT_ACCESS_OP_WRITE_CHR) {
|
if (ctxt->op == BLE_GATT_ACCESS_OP_WRITE_CHR) {
|
||||||
static constexpr size_t stringTerminatorSize{1}; // end of string '\0'
|
constexpr size_t stringTerminatorSize = 1; // end of string '\0'
|
||||||
static constexpr size_t headerSize{3};
|
constexpr size_t headerSize = 3;
|
||||||
const auto maxMessageSize {NotificationManager::MaximumMessageSize()};
|
const auto maxMessageSize {NotificationManager::MaximumMessageSize()};
|
||||||
const auto maxBufferSize{maxMessageSize + headerSize};
|
const auto maxBufferSize{maxMessageSize + headerSize};
|
||||||
|
|
||||||
size_t bufferSize = min(OS_MBUF_PKTLEN(ctxt->om) + stringTerminatorSize, maxBufferSize);
|
const auto dbgPacketLen = OS_MBUF_PKTLEN(ctxt->om);
|
||||||
char *message = (char *)(&ctxt->om->om_data[headerSize]);
|
size_t bufferSize = min(dbgPacketLen + stringTerminatorSize, maxBufferSize);
|
||||||
auto messageSize = min(maxMessageSize, (bufferSize-headerSize));
|
auto messageSize = min(maxMessageSize, (bufferSize-headerSize));
|
||||||
|
|
||||||
message[messageSize-1] = '\0';
|
NotificationManager::Notification notif;
|
||||||
|
os_mbuf_copydata(ctxt->om, headerSize, messageSize-1, notif.message.data());
|
||||||
|
notif.message[messageSize-1] = '\0';
|
||||||
|
notif.category = Pinetime::Controllers::NotificationManager::Categories::SimpleAlert;
|
||||||
|
notificationManager.Push(std::move(notif));
|
||||||
|
|
||||||
notificationManager.Push(Pinetime::Controllers::NotificationManager::Categories::SimpleAlert, message, messageSize);
|
|
||||||
systemTask.PushMessage(Pinetime::System::SystemTask::Messages::OnNewNotification);
|
systemTask.PushMessage(Pinetime::System::SystemTask::Messages::OnNewNotification);
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
#include <systemtask/SystemTask.h>
|
#include <systemtask/SystemTask.h>
|
||||||
|
#include <cstring>
|
||||||
#include "ImmediateAlertService.h"
|
#include "ImmediateAlertService.h"
|
||||||
#include "AlertNotificationService.h"
|
#include "AlertNotificationService.h"
|
||||||
|
|
||||||
|
@ -67,7 +68,12 @@ int ImmediateAlertService::OnAlertLevelChanged(uint16_t connectionHandle, uint16
|
||||||
if(context->op == BLE_GATT_ACCESS_OP_WRITE_CHR) {
|
if(context->op == BLE_GATT_ACCESS_OP_WRITE_CHR) {
|
||||||
auto alertLevel = static_cast<Levels>(context->om->om_data[0]);
|
auto alertLevel = static_cast<Levels>(context->om->om_data[0]);
|
||||||
auto* alertString = ToString(alertLevel);
|
auto* alertString = ToString(alertLevel);
|
||||||
notificationManager.Push(Pinetime::Controllers::NotificationManager::Categories::SimpleAlert, alertString, strlen(alertString));
|
|
||||||
|
NotificationManager::Notification notif;
|
||||||
|
std::memcpy(notif.message.data(), alertString, strlen(alertString));
|
||||||
|
notif.category = Pinetime::Controllers::NotificationManager::Categories::SimpleAlert;
|
||||||
|
notificationManager.Push(std::move(notif));
|
||||||
|
|
||||||
systemTask.PushMessage(Pinetime::System::SystemTask::Messages::OnNewNotification);
|
systemTask.PushMessage(Pinetime::System::SystemTask::Messages::OnNewNotification);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,17 +7,10 @@ using namespace Pinetime::Controllers;
|
||||||
constexpr uint8_t NotificationManager::MessageSize;
|
constexpr uint8_t NotificationManager::MessageSize;
|
||||||
|
|
||||||
|
|
||||||
void NotificationManager::Push(Pinetime::Controllers::NotificationManager::Categories category,
|
void NotificationManager::Push(NotificationManager::Notification &¬if) {
|
||||||
const char *message, uint8_t currentMessageSize) {
|
|
||||||
// TODO handle edge cases on read/write index
|
|
||||||
auto checkedSize = std::min(currentMessageSize, MessageSize);
|
|
||||||
auto& notif = notifications[writeIndex];
|
|
||||||
std::memcpy(notif.message.data(), message, checkedSize);
|
|
||||||
notif.message[checkedSize] = '\0';
|
|
||||||
notif.category = category;
|
|
||||||
notif.id = GetNextId();
|
notif.id = GetNextId();
|
||||||
notif.valid = true;
|
notif.valid = true;
|
||||||
|
notifications[writeIndex] = std::move(notif);
|
||||||
writeIndex = (writeIndex + 1 < TotalNbNotifications) ? writeIndex + 1 : 0;
|
writeIndex = (writeIndex + 1 < TotalNbNotifications) ? writeIndex + 1 : 0;
|
||||||
if(!empty)
|
if(!empty)
|
||||||
readIndex = (readIndex + 1 < TotalNbNotifications) ? readIndex + 1 : 0;
|
readIndex = (readIndex + 1 < TotalNbNotifications) ? readIndex + 1 : 0;
|
||||||
|
|
|
@ -20,7 +20,7 @@ namespace Pinetime {
|
||||||
};
|
};
|
||||||
Notification::Id nextId {0};
|
Notification::Id nextId {0};
|
||||||
|
|
||||||
void Push(Categories category, const char* message, uint8_t messageSize);
|
void Push(Notification&& notif);
|
||||||
Notification GetLastNotification();
|
Notification GetLastNotification();
|
||||||
Notification GetNext(Notification::Id id);
|
Notification GetNext(Notification::Id id);
|
||||||
Notification GetPrevious(Notification::Id id);
|
Notification GetPrevious(Notification::Id id);
|
||||||
|
|
Loading…
Reference in a new issue