X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Floadbalance.C;h=7ea93415eab042e08c7dfd0a372c49ec7070f544;hb=60f8df69db9ddd8148bfc41a17bb0955b52a45e6;hp=5765e39832cd5d23f4078cdfae4b5dc4b4dced18;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/loadbalance.C b/cinelerra-5.1/cinelerra/loadbalance.C index 5765e398..7ea93415 100644 --- a/cinelerra-5.1/cinelerra/loadbalance.C +++ b/cinelerra-5.1/cinelerra/loadbalance.C @@ -2,21 +2,21 @@ /* * CINELERRA * Copyright (C) 2008 Adam Williams - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * */ #include "condition.h" @@ -46,7 +46,6 @@ LoadPackage::~LoadPackage() LoadClient::LoadClient(LoadServer *server) : Thread(1, 0, 0) { - Thread::set_synchronous(1); this->server = server; done = 0; package_number = 0; @@ -57,7 +56,6 @@ LoadClient::LoadClient(LoadServer *server) LoadClient::LoadClient() : Thread(1, 0, 0) { - Thread::set_synchronous(1); server = 0; done = 0; package_number = 0; @@ -95,8 +93,8 @@ void LoadClient::run() { // Read packet LoadPackage *package; - - + + server->client_lock->lock("LoadClient::run"); if(server->current_package < server->total_packages) { @@ -256,9 +254,9 @@ void LoadServer::process_packages() is_single = 0; create_clients(); create_packages(); - - - + + + // Set up packages init_packages(); @@ -268,7 +266,7 @@ void LoadServer::process_packages() { clients[i]->input_lock->unlock(); } - + // Wait for packages to get finished for(int i = 0; i < total_packages; i++) {