author | zecke <zecke> | 2003-02-05 08:54:58 (UTC) |
---|---|---|
committer | zecke <zecke> | 2003-02-05 08:54:58 (UTC) |
commit | bbb3690f12191763a407e6a0edd521113b3c25ac (patch) (unidiff) | |
tree | 39f90d71c7f085f5722382db4a5577bbda2e1618 /x11/libqpe-x11/qt | |
parent | 97b96e141fca844317e59ca5b99c1bf5fa52b1f0 (diff) | |
download | opie-bbb3690f12191763a407e6a0edd521113b3c25ac.zip opie-bbb3690f12191763a407e6a0edd521113b3c25ac.tar.gz opie-bbb3690f12191763a407e6a0edd521113b3c25ac.tar.bz2 |
Fix the IPC server and client
registering channel is done locally with refcounts
if the channel is already registered globally
Fix some sizes to allow proper communication..
-rw-r--r-- | x11/libqpe-x11/qt/qcopchannel_qws.cpp | 31 | ||||
-rw-r--r-- | x11/libqpe-x11/qt/qcopchannel_qws.h | 4 |
2 files changed, 25 insertions, 10 deletions
diff --git a/x11/libqpe-x11/qt/qcopchannel_qws.cpp b/x11/libqpe-x11/qt/qcopchannel_qws.cpp index e90f056..1cea80c 100644 --- a/x11/libqpe-x11/qt/qcopchannel_qws.cpp +++ b/x11/libqpe-x11/qt/qcopchannel_qws.cpp | |||
@@ -6,2 +6,3 @@ | |||
6 | QList<QCopChannel>* QCopChannel::m_list = 0; | 6 | QList<QCopChannel>* QCopChannel::m_list = 0; |
7 | QMap<QCString, int> QCopChannel::m_refCount; | ||
7 | 8 | ||
@@ -10,6 +11,15 @@ QCopChannel::QCopChannel( const QCString& channel, QObject* parent, | |||
10 | : QObject( parent, name ),m_chan(channel) { | 11 | : QObject( parent, name ),m_chan(channel) { |
11 | init(); | ||
12 | if (!m_list ) { | 12 | if (!m_list ) { |
13 | m_list = new QList<QCopChannel>; | 13 | m_list = new QList<QCopChannel>; |
14 | /* only connect once */ | ||
15 | connect(OCOPClient::self(), SIGNAL(called(const QCString&, const QCString&, const QByteArray& ) ), | ||
16 | this, SLOT(rev(const QCString&, const QCString&, const QByteArray&) ) ); | ||
14 | } | 17 | } |
18 | /* first registration or ref count is 0 for m_chan*/ | ||
19 | if (!m_refCount.contains( m_chan ) || !m_refCount[m_chan] ) { | ||
20 | m_refCount[m_chan] = 1; | ||
21 | OCOPClient::self()->addChannel( m_chan ); | ||
22 | }else | ||
23 | m_refCount[m_chan]++; | ||
24 | |||
15 | m_list->append(this); | 25 | m_list->append(this); |
@@ -20,2 +30,9 @@ void QCopChannel::receive( const QCString& msg, const QByteArray& ar ) { | |||
20 | QCopChannel::~QCopChannel() { | 30 | QCopChannel::~QCopChannel() { |
31 | if (m_refCount[m_chan] == 1 ) { | ||
32 | OCOPClient::self()->delChannel( m_chan ); | ||
33 | m_refCount[m_chan] = 0; | ||
34 | }else | ||
35 | m_refCount[m_chan]--; | ||
36 | |||
37 | |||
21 | m_list->remove(this); | 38 | m_list->remove(this); |
@@ -25,8 +42,3 @@ QCopChannel::~QCopChannel() { | |||
25 | } | 42 | } |
26 | OCOPClient::self()->delChannel( m_chan ); | 43 | |
27 | } | ||
28 | void QCopChannel::init() { | ||
29 | OCOPClient::self()->addChannel( m_chan ); | ||
30 | connect(OCOPClient::self(), SIGNAL(called(const QCString&, const QCString&, const QByteArray& ) ), | ||
31 | this, SLOT(rev(const QCString&, const QCString&, const QByteArray&) ) ); | ||
32 | } | 44 | } |
@@ -49,2 +61,3 @@ bool QCopChannel::sendLocally( const QCString& chann, const QCString& msg, | |||
49 | const QByteArray& ar ) { | 61 | const QByteArray& ar ) { |
62 | qWarning("Client:sendLocally %s %s", chann.data(), msg.data() ); | ||
50 | if (!m_list ) | 63 | if (!m_list ) |
@@ -52,2 +65,3 @@ bool QCopChannel::sendLocally( const QCString& chann, const QCString& msg, | |||
52 | QCopChannel* chan; | 65 | QCopChannel* chan; |
66 | |||
53 | for ( chan = m_list->first(); chan; chan = m_list->next() ) { | 67 | for ( chan = m_list->first(); chan; chan = m_list->next() ) { |
@@ -60,4 +74,3 @@ bool QCopChannel::sendLocally( const QCString& chann, const QCString& msg, | |||
60 | void QCopChannel::rev( const QCString& chan, const QCString& msg, const QByteArray& ar ) { | 74 | void QCopChannel::rev( const QCString& chan, const QCString& msg, const QByteArray& ar ) { |
61 | if (chan == m_chan ) | 75 | sendLocally( chan, msg, ar ); |
62 | emit received(msg, ar ); | ||
63 | } | 76 | } |
diff --git a/x11/libqpe-x11/qt/qcopchannel_qws.h b/x11/libqpe-x11/qt/qcopchannel_qws.h index 94b199e..c1220cb 100644 --- a/x11/libqpe-x11/qt/qcopchannel_qws.h +++ b/x11/libqpe-x11/qt/qcopchannel_qws.h | |||
@@ -6,2 +6,3 @@ | |||
6 | #include <qlist.h> | 6 | #include <qlist.h> |
7 | #include <qmap.h> | ||
7 | 8 | ||
@@ -32,4 +33,5 @@ private slots: | |||
32 | private: | 33 | private: |
33 | void init(); | 34 | bool isRegisteredLocally( const QCString& str); |
34 | static QList<QCopChannel> *m_list; | 35 | static QList<QCopChannel> *m_list; |
36 | static QMap<QCString, int> m_refCount; | ||
35 | /* the channel */ | 37 | /* the channel */ |