Skip to content

FreeRTOS giveFromISR() when releasing within a handler #846

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

FreeRTOS giveFromISR() when releasing within a handler #846

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a037875
Use semaphore.giveFromISR() when releasing ISR from within handlers. …
mws-rmain Mar 27, 2019
5ecaed7
additional semaphore.give() calls changed to giveFromISR()
mws-rmain Mar 27, 2019
990b76a
additional changes required to compile.
mws-rmain Mar 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Use semaphore.giveFromISR() when releasing ISR from within handlers. … 
…Otherwise esp-idf commit 13523c95b42c77b4263ef98ce054962bcb338636 will fail when an assert verifies request to release is by owner task.
  • Loading branch information
@mws-rmain
mws-rmain committed Mar 27, 2019
commit a037875d1a1a0ce00b9c6614e454514764675aea
6 changes: 3 additions & 3 deletions cpp_utils/BLEAdvertising.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,15 +480,15 @@ void BLEAdvertising::handleGAPEvent(

switch(event) {
case ESP_GAP_BLE_ADV_DATA_SET_COMPLETE_EVT: {
// m_semaphoreSetAdv.give();
// m_semaphoreSetAdv.giveFromISR();
break;
}
case ESP_GAP_BLE_SCAN_RSP_DATA_SET_COMPLETE_EVT: {
// m_semaphoreSetAdv.give();
// m_semaphoreSetAdv.giveFromISR();
break;
}
case ESP_GAP_BLE_ADV_START_COMPLETE_EVT: {
// m_semaphoreSetAdv.give();
// m_semaphoreSetAdv.giveFromISR();
break;
}
case ESP_GAP_BLE_ADV_STOP_COMPLETE_EVT: {
Expand Down
6 changes: 3 additions & 3 deletions cpp_utils/BLECharacteristic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ void BLECharacteristic::handleGATTServerEvent(
// pDescriptor->executeCreate(this);
// pDescriptor = m_descriptorMap.getNext();
// } // End while
m_semaphoreCreateEvt.give();
m_semaphoreCreateEvt.giveFromISR();
}
break;
} // ESP_GATTS_ADD_CHAR_EVT
Expand Down Expand Up @@ -440,7 +440,7 @@ void BLECharacteristic::handleGATTServerEvent(
case ESP_GATTS_CONF_EVT: {
// ESP_LOGD(LOG_TAG, "m_handle = %d, conf->handle = %d", m_handle, param->conf.handle);
if(param->conf.conn_id == getService()->getServer()->getConnId()) // && param->conf.handle == m_handle) // bug in esp-idf and not implemented in arduino yet
m_semaphoreConfEvt.give(param->conf.status);
m_semaphoreConfEvt.giveFromISR(param->conf.status);
break;
}

Expand All @@ -449,7 +449,7 @@ void BLECharacteristic::handleGATTServerEvent(
}

case ESP_GATTS_DISCONNECT_EVT: {
m_semaphoreConfEvt.give();
m_semaphoreConfEvt.giveFromISR();
break;
}

Expand Down
2 changes: 1 addition & 1 deletion cpp_utils/BLEClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ void BLEClient::gattClientEventHandler(
ESP_LOGE(__func__, "disconnect event, reason: %d, connId: %d, my connId: %d, my IF: %d, gattc_if: %d", (int)evtParam->disconnect.reason, evtParam->disconnect.conn_id, getConnId(), getGattcIf(), gattc_if);
if(m_gattc_if != gattc_if)
break;
m_semaphoreOpenEvt.give(evtParam->disconnect.reason);
m_semaphoreOpenEvt.giveFromISR(evtParam->disconnect.reason);
if(!m_isConnected)
break;
// If we receive a disconnect event, set the class flag that indicates that we are
Expand Down
8 changes: 4 additions & 4 deletions cpp_utils/BLERemoteCharacteristic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ void BLERemoteCharacteristic::gattClientEventHandler(esp_gattc_cb_event_t event,
m_value = "";
}

m_semaphoreReadCharEvt.give();
m_semaphoreReadCharEvt.giveFromISR();
break;
} // ESP_GATTC_READ_CHAR_EVT

Expand All @@ -211,7 +211,7 @@ void BLERemoteCharacteristic::gattClientEventHandler(esp_gattc_cb_event_t event,
if (evtParam->reg_for_notify.handle != getHandle()) break;

// We have processed the notify registration and can unlock the semaphore.
m_semaphoreRegForNotifyEvt.give();
m_semaphoreRegForNotifyEvt.giveFromISR();
break;
} // ESP_GATTC_REG_FOR_NOTIFY_EVT

Expand All @@ -223,7 +223,7 @@ void BLERemoteCharacteristic::gattClientEventHandler(esp_gattc_cb_event_t event,
case ESP_GATTC_UNREG_FOR_NOTIFY_EVT: {
if (evtParam->unreg_for_notify.handle != getHandle()) break;
// We have processed the notify un-registration and can unlock the semaphore.
m_semaphoreRegForNotifyEvt.give();
m_semaphoreRegForNotifyEvt.giveFromISR();
break;
} // ESP_GATTC_UNREG_FOR_NOTIFY_EVT:

Expand All @@ -239,7 +239,7 @@ void BLERemoteCharacteristic::gattClientEventHandler(esp_gattc_cb_event_t event,

// There is nothing further we need to do here. This is merely an indication
// that the write has completed and we can unlock the caller.
m_semaphoreWriteCharEvt.give();
m_semaphoreWriteCharEvt.giveFromISR();
break;
} // ESP_GATTC_WRITE_CHAR_EVT

Expand Down
2 changes: 1 addition & 1 deletion cpp_utils/BLEScan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ void BLEScan::handleGAPEvent(
case ESP_GAP_SEARCH_INQ_CMPL_EVT: {
ESP_LOGW(LOG_TAG, "ESP_GAP_SEARCH_INQ_CMPL_EVT");
m_stopped = true;
m_semaphoreScanEnd.give();
m_semaphoreScanEnd.giveFromISR();
if (m_scanCompleteCB != nullptr) {
m_scanCompleteCB(m_scanResults);
}
Expand Down
8 changes: 4 additions & 4 deletions cpp_utils/BLEService.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ void BLEService::handleGATTServerEvent(esp_gatts_cb_event_t event, esp_gatt_if_t
// uint16_t service_handle
case ESP_GATTS_START_EVT: {
if (param->start.service_handle == getHandle()) {
m_semaphoreStartEvt.give();
m_semaphoreStartEvt.giveFromISR();
}
break;
} // ESP_GATTS_START_EVT
Expand All @@ -320,7 +320,7 @@ void BLEService::handleGATTServerEvent(esp_gatts_cb_event_t event, esp_gatt_if_t
//
case ESP_GATTS_STOP_EVT: {
if (param->stop.service_handle == getHandle()) {
m_semaphoreStopEvt.give();
m_semaphoreStopEvt.giveFromISR();
}
break;
} // ESP_GATTS_STOP_EVT
Expand All @@ -341,7 +341,7 @@ void BLEService::handleGATTServerEvent(esp_gatts_cb_event_t event, esp_gatt_if_t
case ESP_GATTS_CREATE_EVT: {
if (getUUID().equals(BLEUUID(param->create.service_id.id.uuid)) && m_instId == param->create.service_id.id.inst_id) {
setHandle(param->create.service_handle);
m_semaphoreCreateEvt.give();
m_semaphoreCreateEvt.giveFromISR();
}
break;
} // ESP_GATTS_CREATE_EVT
Expand All @@ -356,7 +356,7 @@ void BLEService::handleGATTServerEvent(esp_gatts_cb_event_t event, esp_gatt_if_t
//
case ESP_GATTS_DELETE_EVT: {
if (param->del.service_handle == getHandle()) {
m_semaphoreDeleteEvt.give();
m_semaphoreDeleteEvt.giveFromISR();
}
break;
} // ESP_GATTS_DELETE_EVT
Expand Down