|
@@ -569,7 +569,7 @@ public:
|
|
|
if (pos == NotFound)
|
|
|
{
|
|
|
StringBuffer msg;
|
|
|
- msg.append("ConnectionId=").appendf("%"I64F"x", connectionId).append(", xpath=").append(xpath).append(", sessionId=").appendf("%"I64F"x", sessionId).append(", mode=").append(mode).append(", timeout=");
|
|
|
+ msg.append("ConnectionId=").appendf("%" I64F "x", connectionId).append(", xpath=").append(xpath).append(", sessionId=").appendf("%" I64F "x", sessionId).append(", mode=").append(mode).append(", timeout=");
|
|
|
if (INFINITE == timeout)
|
|
|
msg.append("INFINITE");
|
|
|
else
|
|
@@ -608,7 +608,7 @@ public:
|
|
|
|
|
|
void closed(SessionId id)
|
|
|
{
|
|
|
- LOG(MCwarning, unknownJob, "Connection (%"I64F"x) was leaked by exiting client (%"I64F"x) path=%s", connectionId, id, queryXPath());
|
|
|
+ LOG(MCwarning, unknownJob, "Connection (%" I64F "x) was leaked by exiting client (%" I64F "x) path=%s", connectionId, id, queryXPath());
|
|
|
aborted(id);
|
|
|
subsid=0;
|
|
|
}
|
|
@@ -987,7 +987,7 @@ void writeDelta(StringBuffer &xml, IFile &iFile, const char *msg="", unsigned re
|
|
|
char *headerPtr = (char *)header.bufferBase();
|
|
|
sprintf(strNum, "%010u", ~crc);
|
|
|
memcpy(headerPtr + deltaHeaderCrcOff, strNum, 10);
|
|
|
- sprintf(strNum, "%016"I64F"X", fLen);
|
|
|
+ sprintf(strNum, "%016" I64F "X", fLen);
|
|
|
memcpy(headerPtr + deltaHeaderSizeOff, strNum, 16);
|
|
|
iFileIO->write(0, strlen(deltaHeader), headerPtr);
|
|
|
}
|
|
@@ -1413,7 +1413,7 @@ class CLegacyBinaryFileExternal : public CExternalFile, implements IExternalHand
|
|
|
public:
|
|
|
IMPLEMENT_IINTERFACE;
|
|
|
|
|
|
- CLegacyBinaryFileExternal(const char *dataPath, CBackupHandler &backupHandler) : CExternalFile("."EF_LegacyBinaryValue, dataPath, backupHandler) { }
|
|
|
+ CLegacyBinaryFileExternal(const char *dataPath, CBackupHandler &backupHandler) : CExternalFile("." EF_LegacyBinaryValue, dataPath, backupHandler) { }
|
|
|
virtual void resetAsExternal(IPropertyTree &tree)
|
|
|
{
|
|
|
tree.setProp(NULL, (char *)NULL);
|
|
@@ -1518,7 +1518,7 @@ class CBinaryFileExternal : public CExternalFile, implements IExternalHandler
|
|
|
public:
|
|
|
IMPLEMENT_IINTERFACE;
|
|
|
|
|
|
- CBinaryFileExternal(const char *dataPath, CBackupHandler &backupHandler) : CExternalFile("."EF_BinaryValue, dataPath, backupHandler) { }
|
|
|
+ CBinaryFileExternal(const char *dataPath, CBackupHandler &backupHandler) : CExternalFile("." EF_BinaryValue, dataPath, backupHandler) { }
|
|
|
virtual void resetAsExternal(IPropertyTree &tree)
|
|
|
{
|
|
|
tree.setProp(NULL, (char *)NULL);
|
|
@@ -1619,7 +1619,7 @@ class CXMLFileExternal : public CExternalFile, implements IExternalHandler
|
|
|
public:
|
|
|
IMPLEMENT_IINTERFACE;
|
|
|
|
|
|
- CXMLFileExternal(const char *dataPath, CBackupHandler &backupHandler) : CExternalFile("."EF_XML, dataPath, backupHandler) { }
|
|
|
+ CXMLFileExternal(const char *dataPath, CBackupHandler &backupHandler) : CExternalFile("." EF_XML, dataPath, backupHandler) { }
|
|
|
virtual void resetAsExternal(IPropertyTree &_tree)
|
|
|
{
|
|
|
PTree &tree = *QUERYINTERFACE(&_tree, PTree);
|
|
@@ -2249,7 +2249,7 @@ CServerConnection::~CServerConnection()
|
|
|
|
|
|
void CServerConnection::aborted(SessionId id)
|
|
|
{
|
|
|
- LOG(MCdebugInfo(100), unknownJob, "CServerConnection: connection aborted (%"I64F"x) sessId=%"I64F"x",connectionId, id);
|
|
|
+ LOG(MCdebugInfo(100), unknownJob, "CServerConnection: connection aborted (%" I64F "x) sessId=%" I64F "x",connectionId, id);
|
|
|
#if 0 // JCSMORE - think this is ok, but concerned about deadlock, change later.
|
|
|
Owned<CLCLockBlock> lockBlock = new CLCWriteLockBlock(((CCovenSDSManager &)manager).dataRWLock, readWriteTimeout, __FILE__, __LINE__);
|
|
|
SDSManager->disconnect(connectionId, false);
|
|
@@ -2490,7 +2490,7 @@ public:
|
|
|
virtual void setServerId(__int64 _serverId)
|
|
|
{
|
|
|
if (serverId && serverId != _serverId)
|
|
|
- WARNLOG("Unexpected - client server id mismatch in %s, id=%"I64F"x", queryName(), _serverId);
|
|
|
+ WARNLOG("Unexpected - client server id mismatch in %s, id=%" I64F "x", queryName(), _serverId);
|
|
|
CRemoteTreeBase::setServerId(_serverId);
|
|
|
}
|
|
|
|
|
@@ -3200,7 +3200,7 @@ class CLockInfo : public CInterface, implements IInterface
|
|
|
if (lD->sessId != nodeSessId)
|
|
|
{
|
|
|
StringBuffer out("Removing stale connection session [");
|
|
|
- out.appendf("%"I64F"x], connectionId [%"I64F"x]", lD->sessId, * ((ConnectionId *) imap.getKey()));
|
|
|
+ out.appendf("%" I64F "x], connectionId [%" I64F "x]", lD->sessId, * ((ConnectionId *) imap.getKey()));
|
|
|
out.append(" xpath [").append(xpath).append("]");
|
|
|
PROGLOG("%s", out.str());
|
|
|
querySessionManager().stopSession(lD->sessId, true);
|
|
@@ -3216,7 +3216,7 @@ class CLockInfo : public CInterface, implements IInterface
|
|
|
StringBuffer out("Terminating connection session to ");
|
|
|
out.append(nodeStr);
|
|
|
out.append(" [");
|
|
|
- out.appendf("%"I64F"x], connectionId [%"I64F"x]", lD->sessId, * ((ConnectionId *) imap.getKey()));
|
|
|
+ out.appendf("%" I64F "x], connectionId [%" I64F "x]", lD->sessId, * ((ConnectionId *) imap.getKey()));
|
|
|
out.append(" xpath [").append(xpath).append("]");
|
|
|
PROGLOG("%s", out.str());
|
|
|
queryCoven().disconnect(node);
|
|
@@ -3664,7 +3664,7 @@ public:
|
|
|
time.set(tt);
|
|
|
StringBuffer timeStr;
|
|
|
time.getString(timeStr);
|
|
|
- out.appendf("%-20s|%-16"I64F"x|%-16"I64F"x|%-8x|%s(%d ms)", querySessionManager().getClientProcessEndpoint(lD.sessId, sessEpStr).str(), lD.sessId, connId, lD.mode, timeStr.str(), lockedFor);
|
|
|
+ out.appendf("%-20s|%-16" I64F "x|%-16" I64F "x|%-8x|%s(%d ms)", querySessionManager().getClientProcessEndpoint(lD.sessId, sessEpStr).str(), lD.sessId, connId, lD.mode, timeStr.str(), lockedFor);
|
|
|
++l;
|
|
|
if (l>=nlocks)
|
|
|
break;
|
|
@@ -4123,7 +4123,7 @@ void CSDSTransactionServer::processMessage(CMessageBuffer &mb)
|
|
|
if (0 == id)
|
|
|
{
|
|
|
StringBuffer str("Dali client passing sessionid=0 to connect (xpath=");
|
|
|
- str.append(xpath).append(", mode=").append(mode).append(", connectionId=").appendf("%"I64F"x", connectionId).append(")");
|
|
|
+ str.append(xpath).append(", mode=").append(mode).append(", connectionId=").appendf("%" I64F "x", connectionId).append(")");
|
|
|
WARNLOG("%s", str.str());
|
|
|
}
|
|
|
mb.clear();
|
|
@@ -4179,7 +4179,7 @@ void CSDSTransactionServer::processMessage(CMessageBuffer &mb)
|
|
|
if (0 == id)
|
|
|
{
|
|
|
StringBuffer str("Dali client passing sessionid=0 to multi connect (xpath=");
|
|
|
- str.append(xpath).append(", mode=").append(mode).append(", connectionId=").appendf("%"I64F"x", connectionId).append(")");
|
|
|
+ str.append(xpath).append(", mode=").append(mode).append(", connectionId=").appendf("%" I64F "x", connectionId).append(")");
|
|
|
WARNLOG("%s", str.str());
|
|
|
}
|
|
|
CRemoteConnection *conn = new CRemoteConnection(*SDSManager, connectionId, xpath, id, mode, timeout);
|
|
@@ -4812,7 +4812,7 @@ IPropertyTree *loadStore(const char *storeFilename, IPTreeMaker *iMaker, unsigne
|
|
|
unsigned crc = crcPipeStream->queryCrc();
|
|
|
|
|
|
if (crcValidation && crc != crcValidation)
|
|
|
- LOG(MCoperatorWarning, unknownJob, "Error processing store %s - CRC ERROR (file size=%"I64F"d, validation crc=%x, calculated crc=%x)", storeFilename, iFileIOStore->size(), crcValidation, crc); // not fatal yet (maybe later)
|
|
|
+ LOG(MCoperatorWarning, unknownJob, "Error processing store %s - CRC ERROR (file size=%" I64F "d, validation crc=%x, calculated crc=%x)", storeFilename, iFileIOStore->size(), crcValidation, crc); // not fatal yet (maybe later)
|
|
|
}
|
|
|
catch (IException *e)
|
|
|
{
|
|
@@ -5029,7 +5029,7 @@ public:
|
|
|
if (e>readWriteSlowTracing)
|
|
|
{
|
|
|
StringBuffer s("TIME: CUnlockCallback(write=");
|
|
|
- s.append(lockedForWrite).append(",xpath=").append(xpath).append(", connectionId=").appendf("%"I64F"x", connectionId).append(") took ").append(e);
|
|
|
+ s.append(lockedForWrite).append(",xpath=").append(xpath).append(", connectionId=").appendf("%" I64F "x", connectionId).append(") took ").append(e);
|
|
|
DBGLOG("%s", s.str());
|
|
|
if (readWriteStackTracing)
|
|
|
PrintStackReport();
|
|
@@ -5355,14 +5355,14 @@ public:
|
|
|
{
|
|
|
pos = strlen(deltaHeader);
|
|
|
offset_t lastGood;
|
|
|
- if (sscanf(ptr+deltaHeaderSizeOff, "%"I64F"X", &lastGood))
|
|
|
+ if (sscanf(ptr+deltaHeaderSizeOff, "%" I64F "X", &lastGood))
|
|
|
{
|
|
|
offset_t fSize = iFileIO->size();
|
|
|
if (fSize > lastGood)
|
|
|
{
|
|
|
offset_t diff = fSize - lastGood;
|
|
|
- LOG(MCoperatorError, unknownJob, "Delta file '%s', has %"I64F"d bytes of trailing data (possible power loss during save?), file size: %"I64F"d, last committed size: %"I64F"d", filename, diff, fSize, lastGood);
|
|
|
- LOG(MCoperatorError, unknownJob, "Resetting delta file '%s' to size: %"I64F"d", filename, lastGood);
|
|
|
+ LOG(MCoperatorError, unknownJob, "Delta file '%s', has %" I64F "d bytes of trailing data (possible power loss during save?), file size: %" I64F "d, last committed size: %" I64F "d", filename, diff, fSize, lastGood);
|
|
|
+ LOG(MCoperatorError, unknownJob, "Resetting delta file '%s' to size: %" I64F "d", filename, lastGood);
|
|
|
iFileIO->close();
|
|
|
backup(filename);
|
|
|
iFileIO.setown(iFile->open(IFOreadwrite));
|
|
@@ -7042,7 +7042,7 @@ void CCovenSDSManager::getExternalValueFromServerId(__int64 serverId, MemoryBuff
|
|
|
if (index)
|
|
|
getExternalValue(index, mb);
|
|
|
else
|
|
|
- WARNLOG("External file reference missing (node name='%s', id=%"I64F"d)", idTree->queryName(), serverId);
|
|
|
+ WARNLOG("External file reference missing (node name='%s', id=%" I64F "d)", idTree->queryName(), serverId);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -7868,7 +7868,7 @@ StringBuffer &formatConnectionInfo(MemoryBuffer &src, StringBuffer &out)
|
|
|
unsigned timeout;
|
|
|
bool established;
|
|
|
src.read(connectionId).read(xpath).read(sessionId).read(mode).read(timeout).read(established);
|
|
|
- out.append("ConnectionId=").appendf("%"I64F"x", connectionId).append(", xpath=").append(xpath).append(", sessionId=").appendf("%"I64F"x", sessionId).append(", mode=").append(mode).append(", timeout=");
|
|
|
+ out.append("ConnectionId=").appendf("%" I64F "x", connectionId).append(", xpath=").append(xpath).append(", sessionId=").appendf("%" I64F "x", sessionId).append(", mode=").append(mode).append(", timeout=");
|
|
|
if (INFINITE == timeout)
|
|
|
out.append("INFINITE");
|
|
|
else
|
|
@@ -7883,7 +7883,7 @@ StringBuffer &formatSubscriberInfo(MemoryBuffer &src, StringBuffer &out)
|
|
|
bool sub;
|
|
|
StringAttr xpath;
|
|
|
src.read(subscriptionId).read(sub).read(xpath);
|
|
|
- out.append("SubscriptionId=").appendf("%"I64F"x", subscriptionId).append(", xpath=").append(xpath).append(", sub=").append(sub?"true":"false");
|
|
|
+ out.append("SubscriptionId=").appendf("%" I64F "x", subscriptionId).append(", xpath=").append(xpath).append(", sub=").append(sub?"true":"false");
|
|
|
return out;
|
|
|
}
|
|
|
|
|
@@ -7893,7 +7893,7 @@ StringBuffer &formatNodeSubscriberInfo(MemoryBuffer &src, StringBuffer &out)
|
|
|
StringAttr xpath;
|
|
|
unsigned nodeCount;
|
|
|
src.read(subscriptionId).read(xpath).read(nodeCount);
|
|
|
- out.append("SubscriptionId=").appendf("%"I64F"x", subscriptionId).append(", xpath=").append(xpath).append(", nodes=").append(nodeCount);
|
|
|
+ out.append("SubscriptionId=").appendf("%" I64F "x", subscriptionId).append(", xpath=").append(xpath).append(", nodes=").append(nodeCount);
|
|
|
return out;
|
|
|
}
|
|
|
|
|
@@ -8886,12 +8886,12 @@ bool applyXmlDeltas(IPropertyTree &root, IIOStream &stream, bool stopOnError)
|
|
|
{
|
|
|
const char *pos = child.queryProp("@pos");
|
|
|
if (!pos)
|
|
|
- throw MakeStringException(0, "Missing position attribute in child reference, section end offset=%"I64F"d", sectionEndOffset);
|
|
|
+ throw MakeStringException(0, "Missing position attribute in child reference, section end offset=%" I64F "d", sectionEndOffset);
|
|
|
StringBuffer xpath(name);
|
|
|
xpath.append('[').append(pos).append(']');
|
|
|
IPropertyTree *existingBranch = currentBranch.queryPropTree(xpath.str());
|
|
|
if (!existingBranch)
|
|
|
- throw MakeStringException(0, "Failed to locate delta change in %s, section end offset=%"I64F"d", xpath.str(), sectionEndOffset);
|
|
|
+ throw MakeStringException(0, "Failed to locate delta change in %s, section end offset=%" I64F "d", xpath.str(), sectionEndOffset);
|
|
|
apply(child, *existingBranch);
|
|
|
}
|
|
|
}
|
|
@@ -8917,7 +8917,7 @@ bool applyXmlDeltas(IPropertyTree &root, IIOStream &stream, bool stopOnError)
|
|
|
throw MakeStringException(0, "Failed to locate header xpath = %s", xpath);
|
|
|
IPropertyTree *start = match.queryPropTree("Delta/T");
|
|
|
if (!start)
|
|
|
- throw MakeStringException(0, "Badly constructed delta format (missing Delta/T) in header path=%s, section end offset=%"I64F"d", xpath, endOffset);
|
|
|
+ throw MakeStringException(0, "Badly constructed delta format (missing Delta/T) in header path=%s, section end offset=%" I64F "d", xpath, endOffset);
|
|
|
headerPath.set(xpath);
|
|
|
apply(*start, *root);
|
|
|
}
|
|
@@ -8980,7 +8980,7 @@ void LogRemoteConn(IRemoteConnection *conn)
|
|
|
IPropertyTree *root = conn->queryRoot();
|
|
|
CRemoteTreeBase *remotetree = root?QUERYINTERFACE(root,CRemoteTreeBase):NULL;
|
|
|
unsigned rcount = remotetree?remotetree->getLinkCount()-1:((unsigned)-1);
|
|
|
- PROGLOG("CONN(%x,%"I64F"x,%"I64F"x) path = '%s' mode = %x, link %d,%d",
|
|
|
+ PROGLOG("CONN(%x,%" I64F "x,%" I64F "x) path = '%s' mode = %x, link %d,%d",
|
|
|
(unsigned)(memsize_t)conn,
|
|
|
(__int64)conbase->querySessionId(),
|
|
|
(__int64)conbase->queryConnectionId(),
|