desktop/source/lib/init.cxx | 111
+++-------
include/LibreOfficeKit/LibreOfficeKit.h | 6
include/LibreOfficeKit/LibreOfficeKit.hxx | 20
-
ridljar/com/sun/star/lib/connections/websocket/WebsocketConnection.java | 6
4 files changed, 52 insertions(+), 91 deletions(-)
New commits:
commit ef5cb6cdcd50942aea56ffb322bc89a4c7069bc6
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Fri Sep 29 12:12:10 2023 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Sep 29 14:14:39 2023 +0200
make FunctionBasedURPConnection simpler
and leave it to the client how it wants to read/provide the data
Change-Id: Ibd4d967b79a699c96d1ea8529544b585a97cc0c8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157405
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 434b65319776..d0c3e5fe939b 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2576,10 +2576,10 @@ static char* lo_extractRequest(LibreOfficeKit* pThis,
static void lo_trimMemory(LibreOfficeKit* pThis, int nTarget);
-static int
-lo_startURP(LibreOfficeKit* pThis, void* pReceiveURPFromLOContext, void**
pSendURPToLOContext,
+static void*
+lo_startURP(LibreOfficeKit* pThis, void* pReceiveURPFromLOContext, void*
pSendURPToLOContext,
int (*fnReceiveURPFromLO)(void* pContext, const signed char*
pBuffer, int nLen),
- int (**pfnSendURPToLO)(void* pContext, const signed char* pBuffer,
int nLen));
+ int (*fnSendURPToLO)(void* pContext, signed char* pBuffer, int
nLen));
static void lo_stopURP(LibreOfficeKit* pThis, void* pSendURPToLOContext);
@@ -3234,39 +3234,39 @@ Reference<XInterface>
FunctionBasedURPInstanceProvider::getInstance(const OUStri
class FunctionBasedURPConnection : public
cppu::WeakImplHelper<css::connection::XConnection>
{
public:
- explicit FunctionBasedURPConnection(void*, int (*)(void* pContext, const
signed char* pBuffer,
- int nLen));
+ explicit FunctionBasedURPConnection(void*, int (*)(void* pContext, const
signed char* pBuffer, int nLen),
+ void*, int (*)(void* pContext, signed
char* pBuffer, int nLen));
~FunctionBasedURPConnection();
// These overridden member functions use "read" and "write" from the point
of view of LO,
// i.e. the opposite to how startURP() uses them.
- virtual sal_Int32 SAL_CALL read(Sequence<sal_Int8>& aReadBytes,
+ virtual sal_Int32 SAL_CALL read(Sequence<sal_Int8>& rReadBytes,
sal_Int32 nBytesToRead) override;
virtual void SAL_CALL write(const Sequence<sal_Int8>& aData) override;
virtual void SAL_CALL flush() override;
virtual void SAL_CALL close() override;
virtual OUString SAL_CALL getDescription() override;
void setBridge(Reference<XBridge>);
- int addClientURPToBuffer(const signed char* pBuffer, int nLen);
void* getContext();
inline static int g_connectionCount = 0;
private:
- std::shared_ptr<std::deque<signed char>> m_pBuffer;
void* m_pRecieveFromLOContext;
+ void* m_pSendURPToLOContext;
int (*m_fnReceiveURPFromLO)(void* pContext, const signed char* pBuffer,
int nLen);
+ int (*m_fnSendURPToLO)(void* pContext, signed char* pBuffer, int nLen);
Reference<XBridge> m_URPBridge;
- std::atomic<bool> m_closed = false;
- std::condition_variable m_URPInBuffer;
- std::mutex m_bufferMutex;
};
FunctionBasedURPConnection::FunctionBasedURPConnection(
void* pRecieveFromLOContext,
- int (*fnRecieveFromLO)(void* pContext, const signed char* pBuffer, int
nLen))
- : m_pBuffer(std::make_shared<std::deque<signed char>>())
- , m_pRecieveFromLOContext(pRecieveFromLOContext)
- , m_fnReceiveURPFromLO(fnRecieveFromLO)
+ int (*fnReceiveURPFromLO)(void* pContext, const signed char* pBuffer, int
nLen),
+ void* pSendURPToLOContext,
+ int (*fnSendURPToLO)(void* pContext, signed char* pBuffer, int nLen))
+ : m_pRecieveFromLOContext(pRecieveFromLOContext)
+ , m_pSendURPToLOContext(pSendURPToLOContext)
+ , m_fnReceiveURPFromLO(fnReceiveURPFromLO)
+ , m_fnSendURPToLO(fnSendURPToLO)
{
g_connectionCount++;
}
@@ -3277,62 +3277,23 @@
FunctionBasedURPConnection::~FunctionBasedURPConnection()
xComp->dispose(); // TODO: check this doesn't deadlock
}
-int sendURPToLO(void* pContext /* FunctionBasedURPConnection* */, const signed
char* pBuffer,
- int nLen)
-{
- return
static_cast<FunctionBasedURPConnection*>(pContext)->addClientURPToBuffer(pBuffer,
nLen);
-}
-
-int FunctionBasedURPConnection::addClientURPToBuffer(const signed char*
pBuffer, int nLen)
-{
- {
- std::scoped_lock lock(m_bufferMutex);
-
- if (m_closed)
- {
- // We can't write URP to a closed connection
- SAL_WARN("lok.urp", "A client attempted to write URP to a closed "
- "FunctionBasedURPConnection... ignoring");
- return 0;
- }
- m_pBuffer->insert(m_pBuffer->end(), pBuffer, pBuffer + nLen);
- }
- m_URPInBuffer.notify_one();
- return nLen;
-}
-
void* FunctionBasedURPConnection::getContext() { return this; }
-sal_Int32 FunctionBasedURPConnection::read(Sequence<sal_Int8>& aReadBytes,
sal_Int32 nBytesToRead)
+sal_Int32 FunctionBasedURPConnection::read(Sequence<sal_Int8>& rReadBytes,
sal_Int32 nBytesToRead)
{
- if (aReadBytes.getLength() != nBytesToRead)
- {
- aReadBytes.realloc(nBytesToRead);
- }
-
- sal_Int8* result = aReadBytes.getArray();
- // As with osl::StreamPipe, we must always read nBytesToRead...
-
- {
- std::unique_lock lock(m_bufferMutex);
-
- if (nBytesToRead < 0)
- {
- return 0;
- }
- m_URPInBuffer.wait(
- lock, [this, nBytesToRead] { return
static_cast<sal_Int32>(m_pBuffer->size()) >= nBytesToRead; });
+ if (nBytesToRead < 0)
+ return 0;
- std::copy(m_pBuffer->begin(), m_pBuffer->begin() + nBytesToRead,
result);
- m_pBuffer->erase(m_pBuffer->begin(), m_pBuffer->begin() +
nBytesToRead);
- }
+ if (rReadBytes.getLength() != nBytesToRead)
+ rReadBytes.realloc(nBytesToRead);
- return nBytesToRead;
+ // As with osl::StreamPipe, we must always read nBytesToRead...
+ return m_fnSendURPToLO(m_pSendURPToLOContext, rReadBytes.getArray(),
nBytesToRead);
}
-void FunctionBasedURPConnection::write(const Sequence<sal_Int8>& aData)
+void FunctionBasedURPConnection::write(const Sequence<sal_Int8>& rData)
{
- m_fnReceiveURPFromLO(m_pRecieveFromLOContext, aData.getConstArray(),
aData.getLength());
+ m_fnReceiveURPFromLO(m_pRecieveFromLOContext, rData.getConstArray(),
rData.getLength());
}
void FunctionBasedURPConnection::flush() {}
@@ -3340,7 +3301,6 @@ void FunctionBasedURPConnection::flush() {}
void FunctionBasedURPConnection::close()
{
SAL_INFO("lok.urp", "Requested to close FunctionBasedURPConnection");
- m_closed = true;
}
OUString FunctionBasedURPConnection::getDescription() { return ""; }
@@ -3348,20 +3308,19 @@ OUString FunctionBasedURPConnection::getDescription() {
return ""; }
void FunctionBasedURPConnection::setBridge(Reference<XBridge> xBridge) {
m_URPBridge = xBridge; }
}
-static int
-lo_startURP(LibreOfficeKit* /* pThis */, void* pRecieveFromLOContext, void**
ppSendToLOContext,
+static void*
+lo_startURP(LibreOfficeKit* /* pThis */, void* pRecieveFromLOContext, void*
pSendToLOContext,
int (*fnReceiveURPFromLO)(void* pContext, const signed char*
pBuffer, int nLen),
- int (**pfnSendURPToLO)(void* pContext, const signed char* pBuffer,
int nLen))
+ int (*fnSendURPToLO)(void* pContext, signed char* pBuffer, int
nLen))
{
// Here we will roughly do what desktop LO does when one passes a
command-line switch like
// --accept=socket,port=nnnn;urp;StarOffice.ServiceManager. Except that no
listening socket will
- // be created. The communication to the URP will be through the
fnReceiveURPFromLO and pfnSendURPToLO functions.
+ // be created. The communication to the URP will be through the
nReceiveURPFromLO and nSendURPToLO
+ // functions.
rtl::Reference<FunctionBasedURPConnection> connection(
- new FunctionBasedURPConnection(pRecieveFromLOContext,
fnReceiveURPFromLO));
-
- *pfnSendURPToLO = sendURPToLO;
- *ppSendToLOContext = connection->getContext();
+ new FunctionBasedURPConnection(pRecieveFromLOContext,
fnReceiveURPFromLO,
+ pSendToLOContext, fnSendURPToLO));
Reference<XBridgeFactory> xBridgeFactory =
css::bridge::BridgeFactory::create(xContext);
@@ -3373,17 +3332,17 @@ lo_startURP(LibreOfficeKit* /* pThis */, void*
pRecieveFromLOContext, void** ppS
connection->setBridge(std::move(xBridge));
- return true;
+ return connection->getContext();
}
/**
* Stop a function based URP connection that you started with lo_startURP above
*
- * @param pSendToLOContext a pointer to the context you got back using your
ppSendToLOContext before */
+ * @param pSendToLOContext a pointer to the context returned by lo_startURP */
static void lo_stopURP(LibreOfficeKit* /* pThis */,
- void* pSendToLOContext /* FunctionBasedURPConnection*
*/)
+ void* pFunctionBasedURPConnection/*
FunctionBasedURPConnection* */)
{
- static_cast<FunctionBasedURPConnection*>(pSendToLOContext)->close();
+
static_cast<FunctionBasedURPConnection*>(pFunctionBasedURPConnection)->close();
}
static void lo_registerCallback (LibreOfficeKit* pThis,
diff --git a/include/LibreOfficeKit/LibreOfficeKit.h
b/include/LibreOfficeKit/LibreOfficeKit.h
index 5e77e30549d0..96d6a3d3aca7 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/include/LibreOfficeKit/LibreOfficeKit.h
@@ -133,10 +133,10 @@ struct _LibreOfficeKitClass
void (*trimMemory) (LibreOfficeKit* pThis, int nTarget);
/// @see lok::Office::startURP
- int (*startURP)(LibreOfficeKit* pThis, void* pReceiveURPFromLOContext,
- void** ppSendURPToLOContext,
+ void* (*startURP)(LibreOfficeKit* pThis,
+ void* pReceiveURPFromLOContext, void* pSendURPToLOContext,
int (*fnReceiveURPFromLO)(void* pContext, const signed
char* pBuffer, int nLen),
- int (**pfnSendURPToLO)(void* pContext, const signed char*
pBuffer, int nLen));
+ int (*fnSendURPToLO)(void* pContext, signed char* pBuffer,
int nLen));
/// @see lok::Office::stopURP
void (*stopURP)(LibreOfficeKit* pThis, void* pSendURPToLOContext);
diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx
b/include/LibreOfficeKit/LibreOfficeKit.hxx
index ff3974417c69..c06d2f6d6619 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -1171,26 +1171,26 @@ public:
* Start a UNO acceptor using the function pointers provides to read and
write data to/from the acceptor.
*
* @param pReceiveURPFromLOContext A pointer that will be passed to your
fnRecieveURPFromLO function
- * @param ppSendURPToLOContext A pointer to a pointer that you should give
to the function passing URP to LO will be stored in this.
+ * @param pSendURPToLOContext A pointer that will be passed to your
fnSendURPToLO function
* @param fnReceiveURPFromLO A function pointer that LO should use to pass
URP back to the caller
- * @param pfnSendURPToLO A function pointer pointer that the caller should
use to pass URP to LO will be stored in this.
+ * @param fnSendURPToLO A function pointer pointer that the caller should
use to pass URP to LO
*/
- bool startURP(void* pReceiveURPFromLOContext, void** ppSendURPToLOContext,
- int (*fnReceiveURPFromLO)(void* pContext, const signed char*
pBuffer, int nLen),
- int (**pfnSendURPToLO)(void* pContext, const signed char*
pBuffer, int nLen))
+ void* startURP(void* pReceiveURPFromLOContext, void* pSendURPToLOContext,
+ int (*fnReceiveURPFromLO)(void* pContext, const signed
char* pBuffer, int nLen),
+ int (*fnSendURPToLO)(void* pContext, signed char* pBuffer,
int nLen))
{
- return mpThis->pClass->startURP(mpThis, pReceiveURPFromLOContext,
ppSendURPToLOContext,
- fnReceiveURPFromLO, pfnSendURPToLO);
+ return mpThis->pClass->startURP(mpThis, pReceiveURPFromLOContext,
pSendURPToLOContext,
+ fnReceiveURPFromLO, fnSendURPToLO);
}
/**
* Stop a function based URP connection you previously started with
startURP
*
- * @param pSendURPToLOContext the context you got back in the
ppSendURPToLOContext argument when starting the connection
+ * @param pURPContext the context returned by startURP when starting the
connection
*/
- void stopURP(void* pSendURPToLOContext)
+ void stopURP(void* pURPContext)
{
- mpThis->pClass->stopURP(mpThis, pSendURPToLOContext);
+ mpThis->pClass->stopURP(mpThis, pURPContext);
}
};
commit b409fb0eba05b6b6d78156499210aa75a9cfc14c
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Fri Sep 29 09:26:52 2023 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Sep 29 14:14:32 2023 +0200
cid#1546393 SBSC: String concatenation in loop using + operator
Change-Id: I697830e97b3168aab3e41e96b744ab80edbad31c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157401
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git
a/ridljar/com/sun/star/lib/connections/websocket/WebsocketConnection.java
b/ridljar/com/sun/star/lib/connections/websocket/WebsocketConnection.java
index 9f3c0afbb5fe..7afff73048f5 100644
--- a/ridljar/com/sun/star/lib/connections/websocket/WebsocketConnection.java
+++ b/ridljar/com/sun/star/lib/connections/websocket/WebsocketConnection.java
@@ -279,7 +279,7 @@ public class WebsocketConnection extends WebSocketClient
implements XConnection,
public void onMessage(ByteBuffer message) {
byte[] prefixedMessageBytes = message.array();
- String messageType = "";
+ StringBuffer messageTypeBuf = new StringBuffer();
boolean hasType = false;
int i;
for (i = 0; i < prefixedMessageBytes.length - 1; i++) {
@@ -287,7 +287,7 @@ public class WebsocketConnection extends WebSocketClient
implements XConnection,
hasType = true;
break; // The type ends with ": ", so if we find this
sequence we found the end of our type
}
- messageType += (char)prefixedMessageBytes[i];
+ messageTypeBuf.append((char)prefixedMessageBytes[i]);
}
if(!hasType) {
@@ -295,6 +295,8 @@ public class WebsocketConnection extends WebSocketClient
implements XConnection,
return;
}
+ String messageType = messageTypeBuf.toString();
+
int messageStartIndex = i + 2;
if (!messageType.equals("urp")) {
