pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-02-10 18:05:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

проблема с параллельным запуском под линукс

Browse Source 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@64248 954022d7-b5bf-4e40-9824-e11837661b57
This commit is contained in:
Oleg.Korshul
2015-08-24 13:30:59 +00:00
committed by Alexander Trofimov
parent 316d8acdae
commit 88ef7bcd9d
3 changed files with 100 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
HtmlFile/HtmlFile.cpp
View File

@ -251,34 +251,21 @@ int CHtmlFile::Convert(const std::vector<std::wstring>& arFiles, const std::wstr
(char * const *)nenv);
exit(EXIT_SUCCESS);
#else
const char* nargs[4];
nargs[0] = "--auto-servernum";
nargs[1] = sProgramm.c_str();
nargs[2] = sXmlA.c_str();
nargs[3] = NULL;
const char* nargs[6];
nargs[0] = "-a";
nargs[1] = "--auto-servernum";
nargs[2] = "--server-num=1";
nargs[3] = sProgramm.c_str();
nargs[4] = sXmlA.c_str();
nargs[5] = NULL;
const char* nenv[3];
nenv[0] = sLibraryDir.c_str();
nenv[1] = "DISPLAY=:99";
nenv[1] = NULL;//"DISPLAY=:99";
nenv[2] = NULL;
execve("/usr/bin/xvfb-run", (char * const *)nargs, (char * const *)nenv);
/*
std::string ssXml = "\"" + sXmlA + "\"";
int nRes = execl("/usr/bin/Xvfb", "X", ":4");
execl("/usr/bin/xvfb-run",
"-a",
"/home/oleg/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents/HtmlFile/Internal/linux/Release/HtmlFileInternal",
ssXml.c_str());
FILE* f = fopen("/home/oleg/activex/1/111.log", "a+");
fprintf(f, "ececl: %d\n", (int)errno);
fclose(f);
*/
exit(EXIT_SUCCESS);
#endif
break;