Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2026-01-11 15:16:07 +01:00
Code Issues Projects Releases Wiki Activity

2020-02-18 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a regression in the implmenetation of the 'Set Serial Trap'
	['SI'] RML that could cause deadlocks and intermittent operation.
This commit is contained in:
Fred Gleason
2020-02-18 08:13:03 -05:00
parent 15cd9954a0
commit 16f8154800
6 changed files with 45 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/rdcodetrap.cpp
View File

@@ -2,7 +2,7 @@
//
// A class for trapping arbitrary character sequences.
//
// (C) Copyright 2002-2004,2016 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2020 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU Library General Public License
@@ -37,7 +37,7 @@ RDCodeTrap::~RDCodeTrap()
void RDCodeTrap::addTrap(int id,const char *code,int length)
{
for(unsigned i=0;i<trap_events.size();i++) {
for(int i=0;i<trap_events.size();i++) {
if(length==trap_events[i].length) {
if((trap_events[i].id==id)&&
(!strncmp(code,trap_events[i].code,length))) {
@@ -45,7 +45,7 @@ void RDCodeTrap::addTrap(int id,const char *code,int length)
}
}
}
trap_events.push_back(RTrapEvent());
trap_events.push_back(RDTrapEvent());
trap_events.back().id=id;
trap_events.back().code=new char[length];
memcpy(trap_events.back().code,code,length);
@@ -56,10 +56,10 @@ void RDCodeTrap::addTrap(int id,const char *code,int length)
void RDCodeTrap::removeTrap(int id)
{
for(unsigned i=0;i<trap_events.size();i++) {
for(int i=0;i<trap_events.size();i++) {
if(trap_events[i].id==id) {
delete trap_events[i].code;
vector<RTrapEvent>::iterator it=trap_events.begin()+i;
QList<RDTrapEvent>::iterator it=trap_events.begin()+i;
trap_events.erase(it,it+1);
i--;
}
@@ -69,11 +69,11 @@ void RDCodeTrap::removeTrap(int id)
void RDCodeTrap::removeTrap(const char *code,int length)
{
for(unsigned i=0;i<trap_events.size();i++) {
for(int i=0;i<trap_events.size();i++) {
if(length==trap_events[i].length) {
if(!strncmp(code,trap_events[i].code,length)) {
delete trap_events[i].code;
vector<RTrapEvent>::iterator it=trap_events.begin()+i;
QList<RDTrapEvent>::iterator it=trap_events.begin()+i;
trap_events.erase(it,it+1);
i--;
}
@@ -84,12 +84,12 @@ void RDCodeTrap::removeTrap(const char *code,int length)
void RDCodeTrap::removeTrap(int id,const char *code,int length)
{
for(unsigned i=0;i<trap_events.size();i++) {
for(int i=0;i<trap_events.size();i++) {
if(length==trap_events[i].length) {
if((trap_events[i].id==id)&&
(!strncmp(code,trap_events[i].code,length))) {
delete trap_events[i].code;
vector<RTrapEvent>::iterator it=trap_events.begin()+i;
QList<RDTrapEvent>::iterator it=trap_events.begin()+i;
trap_events.erase(it,it+1);
i--;
}
@@ -100,7 +100,7 @@ void RDCodeTrap::removeTrap(int id,const char *code,int length)
void RDCodeTrap::scan(const char *buf,int length)
{
for(unsigned i=0;i<trap_events.size();i++) {
for(int i=0;i<trap_events.size();i++) {
for(int j=0;j<length;j++) {
if(buf[j]==trap_events[i].code[trap_events[i].istate]) {
trap_events[i].istate++;

12
lib/rdcodetrap.h
View File

@@ -2,7 +2,7 @@
//
// A class for trapping arbitrary character sequences.
//
// (C) Copyright 2002-2004,2016 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2020 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU Library General Public License
@@ -21,14 +21,10 @@
#ifndef RDCODETRAP_H
#define RDCODETRAP_H
#include <vector>
#include <qlist.h>
#include <qobject.h>
using namespace std;
struct RTrapEvent {
struct RDTrapEvent {
int id;
char *code;
int length;
@@ -53,7 +49,7 @@ class RDCodeTrap : public QObject
void trapped(int id);
private:
vector<struct RTrapEvent> trap_events;
QList<struct RDTrapEvent> trap_events;
};