Auto status change to "Under Review"
| @@ -343,7 +343,7 void VariableAcquisitionWorker::VariableAcquisitionWorkerPrivate::updateToNextRe | |||
|
|
343 | 343 | void VariableAcquisitionWorker::VariableAcquisitionWorkerPrivate::cancelVarRequest( |
|
|
344 | 344 | QUuid varRequestId) |
|
|
345 | 345 | { |
|
|
346 |
qC |
|
|
|
346 | qCDebug(LOG_VariableAcquisitionWorker()) | |
|
|
347 | 347 | << "VariableAcquisitionWorkerPrivate::cancelVarRequest 0"; |
|
|
348 | 348 | lockRead(); |
|
|
349 | 349 | // get all AcqIdentifier in link with varRequestId |
| @@ -360,7 +360,7 void VariableAcquisitionWorker::VariableAcquisitionWorkerPrivate::cancelVarReque | |||
|
|
360 | 360 | for (auto acqId : acqIdsToRm) { |
|
|
361 | 361 | removeAcqRequest(acqId); |
|
|
362 | 362 | } |
|
|
363 |
qC |
|
|
|
363 | qCDebug(LOG_VariableAcquisitionWorker()) | |
|
|
364 | 364 | << "VariableAcquisitionWorkerPrivate::cancelVarRequest end"; |
|
|
365 | 365 | } |
|
|
366 | 366 | |
| @@ -368,27 +368,19 void VariableAcquisitionWorker::VariableAcquisitionWorkerPrivate::removeAcqReque | |||
|
|
368 | 368 | QUuid acqRequestId) |
|
|
369 | 369 | { |
|
|
370 | 370 | qCDebug(LOG_VariableAcquisitionWorker()) |
|
|
371 |
<< "VariableAcquisitionWorkerPrivate::removeAcqRequest |
|
|
|
371 | << "VariableAcquisitionWorkerPrivate::removeAcqRequest"; | |
|
|
372 | 372 | QUuid vIdentifier; |
|
|
373 | 373 | std::shared_ptr<IDataProvider> provider; |
|
|
374 | 374 | lockRead(); |
|
|
375 | 375 | auto acqIt = m_AcqIdentifierToAcqRequestMap.find(acqRequestId); |
|
|
376 | qCDebug(LOG_VariableAcquisitionWorker()) | |
|
|
377 | << "VariableAcquisitionWorkerPrivate::removeAcqRequest 1"; | |
|
|
378 | 376 | if (acqIt != m_AcqIdentifierToAcqRequestMap.cend()) { |
|
|
379 | 377 | vIdentifier = acqIt->second.m_vIdentifier; |
|
|
380 | 378 | provider = acqIt->second.m_Provider; |
|
|
381 | 379 | |
|
|
382 | qCDebug(LOG_VariableAcquisitionWorker()) | |
|
|
383 | << "VariableAcquisitionWorkerPrivate::removeAcqRequest 2"; | |
|
|
384 | 380 | auto it = m_VIdentifierToCurrrentAcqIdNextIdPairMap.find(vIdentifier); |
|
|
385 | 381 | if (it != m_VIdentifierToCurrrentAcqIdNextIdPairMap.cend()) { |
|
|
386 | qCDebug(LOG_VariableAcquisitionWorker()) | |
|
|
387 | << "VariableAcquisitionWorkerPrivate::removeAcqRequest 3"; | |
|
|
388 | 382 | if (it->second.first == acqRequestId) { |
|
|
389 | 383 | // acqRequest is currently running -> let's aborting it |
|
|
390 | qCDebug(LOG_VariableAcquisitionWorker()) | |
|
|
391 | << "VariableAcquisitionWorkerPrivate::removeAcqRequest 4"; | |
|
|
392 | 384 | unlock(); |
|
|
393 | 385 | |
|
|
394 | 386 | // Remove the current request from the worker |
| @@ -396,35 +388,23 void VariableAcquisitionWorker::VariableAcquisitionWorkerPrivate::removeAcqReque | |||
|
|
396 | 388 | |
|
|
397 | 389 | // notify the request aborting to the provider |
|
|
398 | 390 | provider->requestDataAborting(acqRequestId); |
|
|
399 | qCDebug(LOG_VariableAcquisitionWorker()) | |
|
|
400 | << "VariableAcquisitionWorkerPrivate::removeAcqRequest 5"; | |
|
|
401 | 391 | } |
|
|
402 | 392 | else if (it->second.second == acqRequestId) { |
|
|
403 | 393 | it->second.second = QUuid(); |
|
|
404 | qCDebug(LOG_VariableAcquisitionWorker()) | |
|
|
405 | << "VariableAcquisitionWorkerPrivate::removeAcqRequest 6"; | |
|
|
406 | 394 | unlock(); |
|
|
407 | 395 | } |
|
|
408 | 396 | else { |
|
|
409 | qCDebug(LOG_VariableAcquisitionWorker()) | |
|
|
410 | << "VariableAcquisitionWorkerPrivate::removeAcqRequest 7"; | |
|
|
411 | 397 | unlock(); |
|
|
412 | 398 | } |
|
|
413 | 399 | } |
|
|
414 | 400 | else { |
|
|
415 | qCDebug(LOG_VariableAcquisitionWorker()) | |
|
|
416 | << "VariableAcquisitionWorkerPrivate::removeAcqRequest 8"; | |
|
|
417 | 401 | unlock(); |
|
|
418 | 402 | } |
|
|
419 | 403 | } |
|
|
420 | 404 | else { |
|
|
421 | qCDebug(LOG_VariableAcquisitionWorker()) | |
|
|
422 | << "VariableAcquisitionWorkerPrivate::removeAcqRequest 9"; | |
|
|
423 | 405 | unlock(); |
|
|
424 | 406 | } |
|
|
425 | 407 | |
|
|
426 | qCDebug(LOG_VariableAcquisitionWorker()) | |
|
|
427 | << "VariableAcquisitionWorkerPrivate::removeAcqRequest 10"; | |
|
|
428 | 408 | lockWrite(); |
|
|
429 | 409 | |
|
|
430 | 410 | m_AcqIdentifierToAcqDataPacketVectorMap.erase(acqRequestId); |
| @@ -432,5 +412,5 void VariableAcquisitionWorker::VariableAcquisitionWorkerPrivate::removeAcqReque | |||
|
|
432 | 412 | |
|
|
433 | 413 | unlock(); |
|
|
434 | 414 | qCDebug(LOG_VariableAcquisitionWorker()) |
|
|
435 |
<< "VariableAcquisitionWorkerPrivate::removeAcqRequest |
|
|
|
415 | << "VariableAcquisitionWorkerPrivate::removeAcqRequest END"; | |
|
|
436 | 416 | } |
General Comments 3
You need to be logged in to leave comments.
Login now