atria-soft/zeus
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEBUG] correct the service video return

Browse Source
This commit is contained in:
Edouard DUPIN 2017-06-25 15:01:58 +02:00
parent feaa41eb15
commit c5f58d6af6
5 changed files with 47 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
zeus/Promise.cpp
View File

@ -174,13 +174,11 @@ bool zeus::Promise::setMessage(ememory::SharedPtr<zeus::Message> _value) {
return ret;
}
} else {
ZEUS_ERROR("plop ...");
Observer callback;
{
std::unique_lock<std::mutex> lock(m_mutex);
callback = m_callbackElse;
}
ZEUS_ERROR("plop .2.");
if (callback != nullptr) {
bool ret = callback(zeus::FutureBase(sharedFromThis()));
{
@ -189,7 +187,6 @@ bool zeus::Promise::setMessage(ememory::SharedPtr<zeus::Message> _value) {
}
return ret;
}
ZEUS_ERROR("plop .3.");
}
return true;
}

5
zeus/WebServer.cpp
View File

@ -258,8 +258,8 @@ class SendAsyncBinary {
}
};
#define ZEUS_LOG_INPUT_OUTPUT ZEUS_WARNING
//#define ZEUS_LOG_INPUT_OUTPUT ZEUS_VERBOSE
//#define ZEUS_LOG_INPUT_OUTPUT ZEUS_WARNING
#define ZEUS_LOG_INPUT_OUTPUT ZEUS_VERBOSE
int32_t zeus::WebServer::writeBinary(ememory::SharedPtr<zeus::Message> _obj) {
@ -311,7 +311,6 @@ void zeus::WebServer::onReceiveData(std::vector<uint8_t>& _frame, bool _isBinary
disconnect(true);
return;
}
ZEUS_INFO("receive DATA ... ");
ememory::SharedPtr<zeus::Message> dataRaw = zeus::Message::create(sharedFromThis(), _frame);
if (dataRaw == nullptr) {
ZEUS_ERROR("Message Allocation ERROR ... ");

2
zeus/message/Parameter_getParameter.cpp
View File

@ -200,7 +200,7 @@ namespace zeus {
zeus::message::ParamType type = getParameterType(_id);
uint32_t dataSize = getParameterSize(_id);
uint8_t* pointer = const_cast<uint8_t*>(getParameterPointer(_id));
ZEUS_WARNING("get type " << type << " with size=" << dataSize << " pointer=" << uint64_t(pointer) << " sizeof(uint64_t)=" << int32_t(sizeof(uint64_t)));
//ZEUS_WARNING("get type " << type << " with size=" << dataSize << " pointer=" << uint64_t(pointer) << " sizeof(uint64_t)=" << int32_t(sizeof(uint64_t)));
// TODO : Check size ...
if (createType<uint8_t>() == type) {
uint8_t* tmp = reinterpret_cast<uint8_t*>(pointer);

39
zeus/zeus-File.impl.cpp
View File

@ -164,3 +164,42 @@ std::string zeus::storeInFileNotify(zeus::ProxyFile _file, std::string _filename
return sha512String;
}
std::vector<uint8_t> zeus::storeInMemory(zeus::ProxyFile _file) {
std::vector<uint8_t> out;
auto futSize = _file.getSize();
auto futSha = _file.getSha512();
futSize.wait();
int64_t retSize = futSize.get();
int64_t offset = 0;
algue::Sha512 shaCtx;
out.resize(retSize);
int64_t currentOffset = 0;
while (retSize > 0) {
// get by batch of 1 MB
int32_t nbElement = 1*1024*1024;
if (retSize<nbElement) {
nbElement = retSize;
}
auto futData = _file.getPart(offset, offset + nbElement);
futData.wait();
if (futData.hasError() == true) {
throw std::runtime_error("Error when loading data");
}
zeus::Raw buffer = futData.get();
shaCtx.update(buffer.data(), buffer.size());
memcpy(&out[currentOffset], buffer.data(), buffer.size());
currentOffset += buffer.size();
offset += nbElement;
retSize -= nbElement;
ZEUS_VERBOSE("read: " << offset << "/" << futSize.get() << " " << buffer.size());
}
// get the final sha512 of the file:
std::string sha512String = algue::stringConvert(shaCtx.finalize());
futSha.wait();
if (sha512String != futSha.get()) {
ZEUS_ERROR("get wrong Sha512 local : '" << sha512String << "'");
ZEUS_ERROR("get wrong Sha512 remote: '" << futSha.get() << "'");
}
return out;
}

5
zeus/zeus-File.obj.zeus.idl
View File

@ -62,6 +62,11 @@ raw getPart(uint64, uint64)
#return:the sha512 of the file (calculated with the input stream.
[tool-remote] string storeInFile(obj:zeus-File, string)
#brief:Store all the data in a specific vector of data.
#param:file:Handle on the file.
#return:buffer of data.
[tool-remote] vector:uint8 storeInMemory(obj:zeus-File)
#brief:Store all the data in a specific file.
#param:file:Handle on the file.
#param:filename:Local filename.