Browse Source

Remove some debug prints

tags/1.9.7
falkTX 9 years ago
parent
commit
70c4ad100d
2 changed files with 13 additions and 41 deletions
  1. +8
    -15
      source/backend/engine/CarlaEngineBridge.cpp
  2. +5
    -26
      source/backend/plugin/CarlaPluginBridge.cpp

+ 8
- 15
source/backend/engine/CarlaEngineBridge.cpp View File

@@ -351,7 +351,6 @@ struct BridgeNonRtServerControl : public CarlaRingBufferControl<HugeStackBuffer>
{
if (getAvailableDataSize() >= HugeStackBuffer::size*3/4)
{
//carla_stdout("Client waitIfDataIsReachingLimit() reached and waited successfully");
writeOpcode(kPluginBridgeNonRtServerPong);
commitWrite();
return;
@@ -382,7 +381,7 @@ public:
fFirstIdle(true),
fLastPingTime(-1)
{
carla_stdout("CarlaEngineBridge::CarlaEngineBridge(\"%s\", \"%s\", \"%s\", \"%s\")", audioPoolBaseName, rtClientBaseName, nonRtClientBaseName, nonRtServerBaseName);
carla_debug("CarlaEngineBridge::CarlaEngineBridge(\"%s\", \"%s\", \"%s\", \"%s\")", audioPoolBaseName, rtClientBaseName, nonRtClientBaseName, nonRtServerBaseName);

fShmAudioPool.filename = PLUGIN_BRIDGE_NAMEPREFIX_AUDIO_POOL;
fShmAudioPool.filename += audioPoolBaseName;
@@ -419,49 +418,49 @@ public:

if (! fShmAudioPool.attach())
{
carla_stdout("Failed to attach to audio pool shared memory");
carla_stderr("Failed to attach to audio pool shared memory");
return false;
}

if (! fShmRtClientControl.attach())
{
clear();
carla_stdout("Failed to attach to rt client control shared memory");
carla_stderr("Failed to attach to rt client control shared memory");
return false;
}

if (! fShmRtClientControl.mapData())
{
clear();
carla_stdout("Failed to map rt client control shared memory");
carla_stderr("Failed to map rt client control shared memory");
return false;
}

if (! fShmNonRtClientControl.attach())
{
clear();
carla_stdout("Failed to attach to non-rt client control shared memory");
carla_stderr("Failed to attach to non-rt client control shared memory");
return false;
}

if (! fShmNonRtClientControl.mapData())
{
clear();
carla_stdout("Failed to map non-rt control client shared memory");
carla_stderr("Failed to map non-rt control client shared memory");
return false;
}

if (! fShmNonRtServerControl.attach())
{
clear();
carla_stdout("Failed to attach to non-rt server control shared memory");
carla_stderr("Failed to attach to non-rt server control shared memory");
return false;
}

if (! fShmNonRtServerControl.mapData())
{
clear();
carla_stdout("Failed to map non-rt control server shared memory");
carla_stderr("Failed to map non-rt control server shared memory");
return false;
}

@@ -909,8 +908,6 @@ public:
const uint32_t onOff(fShmNonRtClientControl.readBool());

fLastPingTime = onOff ? Time::currentTimeMillis() : -1;

carla_stdout("Carla bridge client side, OnOff ping checks => %s", bool2str(onOff));
} break;

case kPluginBridgeNonRtClientActivate:
@@ -1025,8 +1022,6 @@ public:
CARLA_SAFE_ASSERT_BREAK(chunkFilePathTry[0] != '\0');
if (plugin == nullptr || ! plugin->isEnabled()) break;

carla_stdout("Carla bridge client side setChunkData 001");

String chunkFilePath(chunkFilePathTry);

#ifdef CARLA_OS_WIN
@@ -1043,10 +1038,8 @@ public:
CARLA_SAFE_ASSERT_BREAK(chunkDataBase64.isNotEmpty());

std::vector<uint8_t> chunk(carla_getChunkFromBase64String(chunkDataBase64.toRawUTF8()));
carla_stdout("Carla bridge client side setChunkData 002");

plugin->setChunkData(chunk.data(), chunk.size());
carla_stdout("Carla bridge client side setChunkData done");
break;
}



+ 5
- 26
source/backend/plugin/CarlaPluginBridge.cpp View File

@@ -355,13 +355,10 @@ struct BridgeNonRtClientControl : public CarlaRingBufferControl<BigStackBuffer>
if (getAvailableDataSize() < BigStackBuffer::size/4)
return;

carla_stdout("Server waitIfDataIsReachingLimit() waiting...");

for (int i=50; --i >= 0;)
{
if (getAvailableDataSize() >= BigStackBuffer::size*3/4)
{
carla_stdout("Server waitIfDataIsReachingLimit() reached and waited successfully");
writeOpcode(kPluginBridgeNonRtClientPing);
commitWrite();
return;
@@ -532,7 +529,7 @@ protected:
}
else if (fProcess->isRunning())
{
carla_stderr("CarlaPluginBridgeThread::run() - already running, giving up...");
carla_stderr("CarlaPluginBridgeThread::run() - already running");
}

String name(kPlugin->getName());
@@ -700,11 +697,8 @@ protected:
"Please remove this plugin, and not rely on it from this point.");
kEngine->callback(CarlaBackend::ENGINE_CALLBACK_ERROR, kPlugin->getId(), 0, 0, 0.0f, errorString);
}
else
carla_stderr("CarlaPluginBridgeThread::run() - bridge closed cleanly");
}

carla_stdout("plugin bridge finished");
fProcess = nullptr;
}

@@ -930,8 +924,6 @@ public:
const uint32_t timeoutEnd(Time::getMillisecondCounter() + 60*1000); // 60 secs, 1 minute
const bool needsEngineIdle(pData->engine->getType() != kEngineTypePlugin);

carla_stdout("CarlaPluginBridge::waitForSaved() - now waiting...");

for (; Time::getMillisecondCounter() < timeoutEnd && fBridgeThread.isThreadRunning();)
{
pData->engine->callback(ENGINE_CALLBACK_IDLE, 0, 0, 0, 0.0f, nullptr);
@@ -947,8 +939,6 @@ public:

if (! fSaved)
carla_stderr("CarlaPluginBridge::waitForSaved() - Timeout while requesting save state");
else
carla_stdout("CarlaPluginBridge::waitForSaved() - success!");
}

// -------------------------------------------------------------------
@@ -1091,8 +1081,6 @@ public:
fShmNonRtClientControl.writeOpcode(kPluginBridgeNonRtClientPingOnOff);
fShmNonRtClientControl.writeBool(std::strcmp(value, "true") == 0);
fShmNonRtClientControl.commitWrite();

carla_stdout("Carla bridge server side, OnOff ping checks => %s", value);
return;
}

@@ -1126,8 +1114,6 @@ public:
CARLA_SAFE_ASSERT_RETURN(data != nullptr,);
CARLA_SAFE_ASSERT_RETURN(dataSize > 0,);

carla_stdout("Carla bridge server side, setChunkData 001");

CarlaString dataBase64(CarlaString::asBase64(data, dataSize));
CARLA_SAFE_ASSERT_RETURN(dataBase64.length() > 0,);

@@ -1138,8 +1124,6 @@ public:

if (File(filePath).replaceWithText(dataBase64.buffer()))
{
carla_stdout("Carla bridge server side, setChunkData 002");

const uint32_t ulength(static_cast<uint32_t>(filePath.length()));

const CarlaMutexLocker _cml(fShmNonRtClientControl.mutex);
@@ -1148,15 +1132,11 @@ public:
fShmNonRtClientControl.writeUInt(ulength);
fShmNonRtClientControl.writeCustomData(filePath.toRawUTF8(), ulength);
fShmNonRtClientControl.commitWrite();

carla_stdout("Carla bridge server side, setChunkData sent");
}

// save data internally as well
fInfo.chunk.resize(dataSize);
std::memcpy(fInfo.chunk.data(), data, dataSize);

carla_stdout("Carla bridge server side, setChunkData saved locally too");
}

// -------------------------------------------------------------------
@@ -2370,7 +2350,6 @@ public:
{
fInfo.chunk = carla_getChunkFromBase64String(chunkFile.loadFileAsString().toRawUTF8());
chunkFile.deleteFile();
carla_stderr("chunk data final");
}
} break;

@@ -2471,20 +2450,20 @@ public:

if (! fShmAudioPool.initialize())
{
carla_stdout("Failed to initialize shared memory audio pool");
carla_stderr("Failed to initialize shared memory audio pool");
return false;
}

if (! fShmRtClientControl.initialize())
{
carla_stdout("Failed to initialize RT client control");
carla_stderr("Failed to initialize RT client control");
fShmAudioPool.clear();
return false;
}

if (! fShmNonRtClientControl.initialize())
{
carla_stdout("Failed to initialize Non-RT client control");
carla_stderr("Failed to initialize Non-RT client control");
fShmRtClientControl.clear();
fShmAudioPool.clear();
return false;
@@ -2492,7 +2471,7 @@ public:

if (! fShmNonRtServerControl.initialize())
{
carla_stdout("Failed to initialize Non-RT server control");
carla_stderr("Failed to initialize Non-RT server control");
fShmNonRtClientControl.clear();
fShmRtClientControl.clear();
fShmAudioPool.clear();


Loading…
Cancel
Save