mir/telegram-bot-api
2
0
Fork 0
mirror of https://github.com/tdlib/telegram-bot-api synced 2025-08-22 01:49:24 +00:00
Code Issues Releases Wiki Activity

Compare commits

base: mir:ec02990a76d382e0605b6b4e042eed2f68bd4762
Branches Tags
mir:master
...
compare: mir:16625f70c7367ecadab672e25410faf285e96e2d
Branches Tags
mir:master

4 Commits
ec02990a76 ... 16625f70c7

Author SHA1 Message Date
Erfan Mola
16625f70c7
Merge e2c834103a2f0c648c22362f59dbfa043518e96b into cc83909b80b1bbc8eec8073fb4457c389ceefbe5 2024-12-07 06:37:52 +07:00
AYMENJD
cc83909b80 Fix warning. 2024-12-06 14:24:15 +03:00
levlam
01ee58bd27 Log if failed to get CPU statistics on supported platforms. 2024-12-04 17:31:44 +03:00
Erfan Mola
e2c834103a
Added Multiple Core build support option 
Added an option to chose multi core build by using clang's -j parameter
 2022-12-30 13:53:00 +00:00
3 changed files with 21 additions and 2 deletions
Show Stats Expand all files Collapse all files

18
build.html
View File

@ -75,7 +75,7 @@
a:hover {
text-decoration: underline;
}
select, button {
select, button, input {
border: 1px solid var(--color-select-border);
background-color: var(--background);
color: var(--color);
@ -266,6 +266,14 @@
<label><input type="checkbox" id="buildRootCheckbox" onchange="onOptionsChanged()"/>Build from root user (not recommended).</label>
</div>
<div id="buildMultiCoreDiv" class="hide">
<label><input type="checkbox" id="buildMultiCoreCheckbox" onchange="onOptionsChanged()"/>Build using mulitple cores<span class="hide" id="buildMultiCoreColon">:</span></label>
<div id="buildMultiCoreInputDiv" class="hide">
<input type="number" id="buildMultiCoreInput" onchange="onOptionsChanged()" placeholder="Cores number" min="1" style="text-align: center;"/>
</div>
</div>
<p></p>
</div>
@ -354,6 +362,7 @@ function onOptionsChanged() {
linux_distro = document.getElementById('linuxSelect').value;
}
document.getElementById('buildCommandsDiv').style.display = 'block';
document.getElementById('buildMultiCoreDiv').style.display = 'block';
var use_clang = os_freebsd || os_openbsd;
if (os_linux && linux_distro !== 'Alpine' && !linux_distro.includes('CentOS') && !linux_distro.includes('Fedora')) {
@ -686,6 +695,11 @@ function onOptionsChanged() {
commands.push('cd ../build');
}
let build_command = cmake + ' --build . --target install';
if (document.getElementById('buildMultiCoreCheckbox').checked && document.getElementById('buildMultiCoreInput').value.toString().length > 0 && !(isNaN(document.getElementById('buildMultiCoreInput').value))) {
build_command += ` -j ${ document.getElementById('buildMultiCoreInput').value }`;
}
if (use_msvc) {
if (!is_debug_build) {
commands.push(build_command + ' --config Release');
@ -704,6 +718,8 @@ function onOptionsChanged() {
if (install_dir !== '/usr/local') {
install_dir = 'telegram-bot-api';
}
document.getElementById('buildMultiCoreInputDiv').style.display = document.getElementById('buildMultiCoreCheckbox').checked ? 'block' : 'none';
document.getElementById('buildMultiCoreColon').style.display = document.getElementById('buildMultiCoreCheckbox').checked ? 'inline' : 'none';
commands.push((use_powershell ? 'dir ' : 'ls -l ') + install_dir + '/bin/telegram-bot-api*');
document.getElementById('buildCommands').innerHTML = '<ul><li>' + commands.join('</li><li>') + '</li></ul>';
document.getElementById('copyBuildCommandsButton').style.display = commands.includes('exit') ? 'none' : 'block';

2
telegram-bot-api/Client.cpp
View File

@ -6666,7 +6666,7 @@ void Client::check_business_connection_chat_id(const td::string &business_connec
}
auto chat_id = r_chat_id.move_as_ok();
check_business_connection(business_connection_id, std::move(query),
[this, chat_id, on_success = std::move(on_success)](
[chat_id, on_success = std::move(on_success)](
const BusinessConnection *business_connection, PromisedQueryPtr query) mutable {
on_success(business_connection, chat_id, std::move(query));
});

3
telegram-bot-api/Stats.cpp
View File

@ -23,6 +23,9 @@ ServerCpuStat::ServerCpuStat() {
void ServerCpuStat::update(double now) {
auto r_cpu_stat = td::cpu_stat();
if (r_cpu_stat.is_error()) {
if (r_cpu_stat.error().message() != "Not supported") {
LOG(ERROR) << "Failed to get CPU statistics: " << r_cpu_stat.error();
}
return;
}