From 0a7f0e285bb952dcdb95ab6a24f5e38f8c151b9d Mon Sep 17 00:00:00 2001 From: David Anderson Date: Tue, 15 Jul 2003 18:19:29 +0000 Subject: [PATCH] license svn path=/trunk/boinc/; revision=1676 --- Makefile.am | 2 +- Makefile.incl | 8 ++++---- api/boinc_api.C | 14 +++++++------- api/boinc_api.h | 5 +++-- api/gutil.cpp | 4 ++-- checkin_notes | 10 +++++++++- client/mac/mac_about.h | 18 +++++++++--------- client/mac/mac_join.h | 18 +++++++++--------- client/win/hostinfo_win.cpp | 4 ++-- client/win/windows_cpp.h | 18 +++++++++--------- client/win/wingui.cpp | 4 ++-- client/win/wingui_listctrl.cpp | 4 ++-- client/win/wingui_listctrl.h | 4 ++-- client/win/wingui_mainwindow.cpp | 4 ++-- client/win/wingui_mainwindow.h | 4 ++-- client/win/wingui_sswindow.cpp | 6 +++--- client/win/wingui_sswindow.h | 4 ++-- doc/index.html | 1 + doc/license_1.0.txt | 23 ++++++----------------- lib/app_ipc.h | 10 ++++++++-- lib/messages.C | 18 +++++++++--------- sched/sched_messages.C | 18 +++++++++--------- test/testproxy | 19 ------------------- tools/Makefile.in | 6 +++--- 24 files changed, 106 insertions(+), 120 deletions(-) diff --git a/Makefile.am b/Makefile.am index 18c5cb9c71..92c605c27a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,7 +11,7 @@ EXTRA_DIST = \ mac_build win_build \ doc html_ops html_user \ stripchart \ - INSTALL LICENSE + INSTALL # the perl line below gets rid of '\r' characters because MSVC barfs at them. diff --git a/Makefile.incl b/Makefile.incl index d13de81f70..005e186bb2 100644 --- a/Makefile.incl +++ b/Makefile.incl @@ -1,12 +1,12 @@ ## -*-Makefile -*- ## $Id$ -MYSQL_INCLUDES = /usr/local/mysql_32bit/include -MYSQL_INCLUDES2 = /usr/local/mysql_32bit/include/mysql -MYSQL_INCLUDES3 = /usr/include/mysql_32bit +MYSQL_INCLUDES = /usr/local/mysql/include +MYSQL_INCLUDES2 = /usr/local/mysql/include/mysql +MYSQL_INCLUDES3 = /usr/include/mysql MYSQL_LIBS = \ - -L/usr/local/mysql_32bit/lib -L/sw/lib/mysql -L/usr/local/lib/mysql \ + -L/usr/local/mysql/lib -L/sw/lib/mysql -L/usr/local/lib/mysql \ -lmysqlclient -L/usr/local/lib -lz \ -lm $(NETLIBS) diff --git a/api/boinc_api.C b/api/boinc_api.C index 0ea165899f..f16f75cc80 100644 --- a/api/boinc_api.C +++ b/api/boinc_api.C @@ -260,7 +260,7 @@ void boinc_quit(int sig) { #endif int boinc_finish(int status) { - int cur_mem; + double cur_mem; boinc_cpu_time(last_checkpoint_cpu_time, cur_mem); update_app_progress(fraction_done, last_checkpoint_cpu_time, last_checkpoint_cpu_time, cur_mem); @@ -305,7 +305,7 @@ bool boinc_time_to_checkpoint() { if (write_frac_done) { double cur_cpu; - int cur_mem; + double cur_mem; boinc_cpu_time(cur_cpu, cur_mem); update_app_progress(fraction_done, cur_cpu, last_checkpoint_cpu_time, cur_mem); time_until_fraction_done_update = aid.fraction_done_update_period; @@ -322,7 +322,7 @@ bool boinc_time_to_checkpoint() { } int boinc_checkpoint_completed() { - int cur_mem; + double cur_mem; boinc_cpu_time(last_checkpoint_cpu_time, cur_mem); update_app_progress(fraction_done, last_checkpoint_cpu_time, last_checkpoint_cpu_time, cur_mem); ready_to_checkpoint = false; @@ -350,7 +350,7 @@ int boinc_child_done(double cpu) { return 0; } -int boinc_cpu_time(double &cpu_t, int &ws_t) { +int boinc_cpu_time(double &cpu_t, double &ws_t) { double cpu_secs; // Start with the CPU time from previous runs, then @@ -369,7 +369,7 @@ int boinc_cpu_time(double &cpu_t, int &ws_t) { cpu_secs += (double)ru.ru_utime.tv_sec + (((double)ru.ru_utime.tv_usec) / ((double)1000000.0)); cpu_secs += (double)ru.ru_stime.tv_sec + (((double)ru.ru_stime.tv_usec) / ((double)1000000.0)); cpu_t = cpu_secs; - ws_t = ru.ru_idrss; + ws_t = ru.ru_idrss; // TODO: fix this (mult by page size) return 0; #else #ifdef _WIN32 @@ -543,14 +543,14 @@ void cleanup_shared_mem(void) { } -int update_app_progress(double frac_done, double cpu_t, double cp_cpu_t, int ws_t) { +int update_app_progress(double frac_done, double cpu_t, double cp_cpu_t, double ws_t) { char msg_buf[SHM_SEG_SIZE]; sprintf( msg_buf, "%2.8f\n" "%10.4f\n" "%10.4f\n" - "%d\n", + "%f\n", frac_done, cpu_t, cp_cpu_t, ws_t ); diff --git a/api/boinc_api.h b/api/boinc_api.h index ddd96809b7..5ee3e818df 100755 --- a/api/boinc_api.h +++ b/api/boinc_api.h @@ -66,9 +66,10 @@ extern int boinc_child_done(double); /////////// API ENDS HERE - IMPLEMENTATION STUFF FOLLOWS -extern int boinc_cpu_time(double &, int &); // CPU time and memory usage for this process +extern int boinc_cpu_time(double&, double&); + // CPU time and memory usage for this process extern int boinc_install_signal_handlers(); -extern int update_app_progress(double, double, double, int); +extern int update_app_progress(double, double, double, double); extern int set_timer(double period); extern void setup_shared_mem(); diff --git a/api/gutil.cpp b/api/gutil.cpp index 8f77ffa559..fe0fc978e1 100755 --- a/api/gutil.cpp +++ b/api/gutil.cpp @@ -1,7 +1,7 @@ -// The contents of this file are subject to the Mozilla Public License +// The contents of this file are subject to the BOINC Public License // Version 1.0 (the "License"); you may not use this file except in // compliance with the License. You may obtain a copy of the License at -// http://www.mozilla.org/MPL/ +// http://boinc.berkeley.edu/license_1.0.txt // // Software distributed under the License is distributed on an "AS IS" // basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the diff --git a/checkin_notes b/checkin_notes index 092076dcba..9c44a83e5d 100755 --- a/checkin_notes +++ b/checkin_notes @@ -5322,4 +5322,12 @@ John Brian 2003/07/11 project.inc user.inc util.inc - view_profile.php (new) \ No newline at end of file + view_profile.php (new) + +David July 15 2003 + - use double for VM working set size + - finished replacing license text + + api/ + boinc_api.C,h + diff --git a/client/mac/mac_about.h b/client/mac/mac_about.h index 00de32d20f..00fb8836d1 100644 --- a/client/mac/mac_about.h +++ b/client/mac/mac_about.h @@ -1,19 +1,19 @@ -// The contents of this file are subject to the Mozilla Public License +// The contents of this file are subject to the BOINC Public License // Version 1.0 (the "License"); you may not use this file except in // compliance with the License. You may obtain a copy of the License at -// http://www.mozilla.org/MPL/ -// +// http://boinc.berkeley.edu/license_1.0.txt +// // Software distributed under the License is distributed on an "AS IS" // basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the // License for the specific language governing rights and limitations -// under the License. -// -// The Original Code is the Berkeley Open Infrastructure for Network Computing. -// +// under the License. +// +// The Original Code is the Berkeley Open Infrastructure for Network Computing. +// // The Initial Developer of the Original Code is the SETI@home project. // Portions created by the SETI@home project are Copyright (C) 2002 -// University of California at Berkeley. All Rights Reserved. -// +// University of California at Berkeley. All Rights Reserved. +// // Contributor(s): // diff --git a/client/mac/mac_join.h b/client/mac/mac_join.h index cbbca55069..a5ce14a372 100644 --- a/client/mac/mac_join.h +++ b/client/mac/mac_join.h @@ -1,19 +1,19 @@ -// The contents of this file are subject to the Mozilla Public License +// The contents of this file are subject to the BOINC Public License // Version 1.0 (the "License"); you may not use this file except in // compliance with the License. You may obtain a copy of the License at -// http://www.mozilla.org/MPL/ -// +// http://boinc.berkeley.edu/license_1.0.txt +// // Software distributed under the License is distributed on an "AS IS" // basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the // License for the specific language governing rights and limitations -// under the License. -// -// The Original Code is the Berkeley Open Infrastructure for Network Computing. -// +// under the License. +// +// The Original Code is the Berkeley Open Infrastructure for Network Computing. +// // The Initial Developer of the Original Code is the SETI@home project. // Portions created by the SETI@home project are Copyright (C) 2002 -// University of California at Berkeley. All Rights Reserved. -// +// University of California at Berkeley. All Rights Reserved. +// // Contributor(s): // diff --git a/client/win/hostinfo_win.cpp b/client/win/hostinfo_win.cpp index fbbc9b0133..e8533ca1bf 100755 --- a/client/win/hostinfo_win.cpp +++ b/client/win/hostinfo_win.cpp @@ -1,7 +1,7 @@ -// The contents of this file are subject to the Mozilla Public License +// The contents of this file are subject to the BOINC Public License // Version 1.0 (the "License"); you may not use this file except in // compliance with the License. You may obtain a copy of the License at -// http://www.mozilla.org/MPL/ +// http://boinc.berkeley.edu/license_1.0.txt // // Software distributed under the License is distributed on an "AS IS" // basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the diff --git a/client/win/windows_cpp.h b/client/win/windows_cpp.h index 82c7d1b4d7..a867606521 100644 --- a/client/win/windows_cpp.h +++ b/client/win/windows_cpp.h @@ -1,19 +1,19 @@ -// The contents of this file are subject to the Mozilla Public License +// The contents of this file are subject to the BOINC Public License // Version 1.0 (the "License"); you may not use this file except in // compliance with the License. You may obtain a copy of the License at -// http://www.mozilla.org/MPL/ -// +// http://boinc.berkeley.edu/license_1.0.txt +// // Software distributed under the License is distributed on an "AS IS" // basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the // License for the specific language governing rights and limitations -// under the License. -// -// The Original Code is the Berkeley Open Infrastructure for Network Computing. -// +// under the License. +// +// The Original Code is the Berkeley Open Infrastructure for Network Computing. +// // The Initial Developer of the Original Code is the SETI@home project. // Portions created by the SETI@home project are Copyright (C) 2002 -// University of California at Berkeley. All Rights Reserved. -// +// University of California at Berkeley. All Rights Reserved. +// // Contributor(s): // diff --git a/client/win/wingui.cpp b/client/win/wingui.cpp index 5ee78ab6e5..e6302e19af 100755 --- a/client/win/wingui.cpp +++ b/client/win/wingui.cpp @@ -1,7 +1,7 @@ -// The contents of this file are subject to the Mozilla Public License +// The contents of this file are subject to the BOINC Public License // Version 1.0 (the "License"); you may not use this file except in // compliance with the License. You may obtain a copy of the License at -// http://www.mozilla.org/MPL/ +// http://boinc.berkeley.edu/license_1.0.txt // // Software distributed under the License is distributed on an "AS IS" // basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the diff --git a/client/win/wingui_listctrl.cpp b/client/win/wingui_listctrl.cpp index 558a85988f..163af0945e 100755 --- a/client/win/wingui_listctrl.cpp +++ b/client/win/wingui_listctrl.cpp @@ -1,7 +1,7 @@ -// The contents of this file are subject to the Mozilla Public License +// The contents of this file are subject to the BOINC Public License // Version 1.0 (the "License"); you may not use this file except in // compliance with the License. You may obtain a copy of the License at -// http://www.mozilla.org/MPL/ +// http://boinc.berkeley.edu/license_1.0.txt // // Software distributed under the License is distributed on an "AS IS" // basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the diff --git a/client/win/wingui_listctrl.h b/client/win/wingui_listctrl.h index 3354035ea6..9940b66252 100755 --- a/client/win/wingui_listctrl.h +++ b/client/win/wingui_listctrl.h @@ -1,7 +1,7 @@ -// The contents of this file are subject to the Mozilla Public License +// The contents of this file are subject to the BOINC Public License // Version 1.0 (the "License"); you may not use this file except in // compliance with the License. You may obtain a copy of the License at -// http://www.mozilla.org/MPL/ +// http://boinc.berkeley.edu/license_1.0.txt // // Software distributed under the License is distributed on an "AS IS" // basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the diff --git a/client/win/wingui_mainwindow.cpp b/client/win/wingui_mainwindow.cpp index 599fac2dcb..4b7f6e05ba 100755 --- a/client/win/wingui_mainwindow.cpp +++ b/client/win/wingui_mainwindow.cpp @@ -1,7 +1,7 @@ -// The contents of this file are subject to the Mozilla Public License +// The contents of this file are subject to the BOINC Public License // Version 1.0 (the "License"); you may not use this file except in // compliance with the License. You may obtain a copy of the License at -// http://www.mozilla.org/MPL/ +// http://boinc.berkeley.edu/license_1.0.txt // // Software distributed under the License is distributed on an "AS IS" // basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the diff --git a/client/win/wingui_mainwindow.h b/client/win/wingui_mainwindow.h index 40c3a625a9..201603f7d2 100755 --- a/client/win/wingui_mainwindow.h +++ b/client/win/wingui_mainwindow.h @@ -1,7 +1,7 @@ -// The contents of this file are subject to the Mozilla Public License +// The contents of this file are subject to the BOINC Public License // Version 1.0 (the "License"); you may not use this file except in // compliance with the License. You may obtain a copy of the License at -// http://www.mozilla.org/MPL/ +// http://boinc.berkeley.edu/license_1.0.txt // // Software distributed under the License is distributed on an "AS IS" // basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the diff --git a/client/win/wingui_sswindow.cpp b/client/win/wingui_sswindow.cpp index 4bff2d0dea..7f5187ae41 100755 --- a/client/win/wingui_sswindow.cpp +++ b/client/win/wingui_sswindow.cpp @@ -1,7 +1,7 @@ -// The contents of this file are subject to the Mozilla Public License +// The contents of this file are subject to the BOINC Public License // Version 1.0 (the "License"); you may not use this file except in // compliance with the License. You may obtain a copy of the License at -// http://www.mozilla.org/MPL/ +// http://boinc.berkeley.edu/license_1.0.txt // // Software distributed under the License is distributed on an "AS IS" // basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the @@ -235,4 +235,4 @@ void CSSWindow::OnTimer(UINT uEventID) Invalidate(); OnPaint(); } -} \ No newline at end of file +} diff --git a/client/win/wingui_sswindow.h b/client/win/wingui_sswindow.h index 6e867a46f9..adee7be0fb 100755 --- a/client/win/wingui_sswindow.h +++ b/client/win/wingui_sswindow.h @@ -1,7 +1,7 @@ -// The contents of this file are subject to the Mozilla Public License +// The contents of this file are subject to the BOINC Public License // Version 1.0 (the "License"); you may not use this file except in // compliance with the License. You may obtain a copy of the License at -// http://www.mozilla.org/MPL/ +// http://boinc.berkeley.edu/license_1.0.txt // // Software distributed under the License is distributed on an "AS IS" // basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the diff --git a/doc/index.html b/doc/index.html index 1763673270..8e3f5c647c 100644 --- a/doc/index.html +++ b/doc/index.html @@ -52,6 +52,7 @@ Help debug and enhance the BOINC software.     Chinese Estonian +Danish French German Russian diff --git a/doc/license_1.0.txt b/doc/license_1.0.txt index 6a9d9c5e0c..916b159182 100644 --- a/doc/license_1.0.txt +++ b/doc/license_1.0.txt @@ -82,7 +82,9 @@ to create, sell, or distribute commercial products based on the Source Code; and - (b) under patents now or hereafter owned or controlled by Initial + (b) Subject to the restrictions on commercial use + set forth in subsection 2.1(a), + under patents now or hereafter owned or controlled by Initial Developer, to make, have made, use and sell (``Utilize'') the Original Code (or portions thereof), but solely to the extent that any such patent is reasonably necessary to enable You to Utilize @@ -104,7 +106,9 @@ to create, sell, or distribute commercial products based on the Source Code; and - (b) under patents now or hereafter owned or controlled by + (b) Subject to the restrictions on commercial use + set forth in subsection 2.2(a), + under patents now or hereafter owned or controlled by Contributor, to Utilize the Contributor Version (or portions thereof), but solely to the extent that any such patent is reasonably necessary to enable You to Utilize the Contributor @@ -234,21 +238,6 @@ This License applies to code to which the Initial Developer has attached the notice in Exhibit A, and to related Covered Code. -6. Versions of the License. - - 6.1. New Versions. - Netscape Communications Corporation (``Netscape'') may publish revised - and/or new versions of the License from time to time. Each version will - be given a distinguishing version number. - - 6.2. Effect of New Versions. - Once Covered Code has been published under a particular version of the - License, You may always continue to use it under the terms of that - version. You may also choose to use such Covered Code under the terms - of any subsequent version of the License published by Netscape. No one - other than Netscape has the right to modify the terms applicable to - Covered Code created under this License. - 7. DISCLAIMER OF WARRANTY. COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN ``AS IS'' BASIS, diff --git a/lib/app_ipc.h b/lib/app_ipc.h index fcdab0f462..42123d17f8 100755 --- a/lib/app_ipc.h +++ b/lib/app_ipc.h @@ -65,18 +65,24 @@ public: void reset_msg(int); // resets specified message and clears its flag }; +// parsed version of main init file +// struct APP_INIT_DATA { char app_preferences[4096]; char user_name[256]; char team_name[256]; - char comm_obj_name[256]; // name to identify shared memory segments, signals, etc - double wu_cpu_time; // cpu time from previous sessions double user_total_credit; double user_expavg_credit; double host_total_credit; double host_expavg_credit; + + // Items below here are for implementation only + // (not used by app writers) + // double checkpoint_period; // recommended checkpoint period int shm_key; + char comm_obj_name[256]; // name to identify shared memory segments, signals, etc + double wu_cpu_time; // cpu time from previous sessions double fraction_done_update_period; }; diff --git a/lib/messages.C b/lib/messages.C index d38ffd9e79..9738087607 100644 --- a/lib/messages.C +++ b/lib/messages.C @@ -1,19 +1,19 @@ -// The contents of this file are subject to the Mozilla Public License +// The contents of this file are subject to the BOINC Public License // Version 1.0 (the "License"); you may not use this file except in // compliance with the License. You may obtain a copy of the License at -// http://www.mozilla.org/MPL/ -// +// http://boinc.berkeley.edu/license_1.0.txt +// // Software distributed under the License is distributed on an "AS IS" // basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the // License for the specific language governing rights and limitations -// under the License. -// -// The Original Code is the Berkeley Open Infrastructure for Network Computing. -// +// under the License. +// +// The Original Code is the Berkeley Open Infrastructure for Network Computing. +// // The Initial Developer of the Original Code is the SETI@home project. // Portions created by the SETI@home project are Copyright (C) 2002 -// University of California at Berkeley. All Rights Reserved. -// +// University of California at Berkeley. All Rights Reserved. +// // Contributor(s): // diff --git a/sched/sched_messages.C b/sched/sched_messages.C index 9ac4ea293a..16ff8b674b 100644 --- a/sched/sched_messages.C +++ b/sched/sched_messages.C @@ -1,19 +1,19 @@ -// The contents of this file are subject to the Mozilla Public License +// The contents of this file are subject to the BOINC Public License // Version 1.0 (the "License"); you may not use this file except in // compliance with the License. You may obtain a copy of the License at -// http://www.mozilla.org/MPL/ -// +// http://boinc.berkeley.edu/license_1.0.txt +// // Software distributed under the License is distributed on an "AS IS" // basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the // License for the specific language governing rights and limitations -// under the License. -// -// The Original Code is the Berkeley Open Infrastructure for Network Computing. -// +// under the License. +// +// The Original Code is the Berkeley Open Infrastructure for Network Computing. +// // The Initial Developer of the Original Code is the SETI@home project. // Portions created by the SETI@home project are Copyright (C) 2002 -// University of California at Berkeley. All Rights Reserved. -// +// University of California at Berkeley. All Rights Reserved. +// // Contributor(s): // diff --git a/test/testproxy b/test/testproxy index 59ca960f5f..3eaad61ffb 100755 --- a/test/testproxy +++ b/test/testproxy @@ -4,25 +4,6 @@ # $Id$ -# The contents of this file are subject to the Mozilla Public License -# Version 1.0 (the "License"); you may not use this file except in -# compliance with the License. You may obtain a copy of the License at -# http:#www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" -# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the -# License for the specific language governing rights and limitations -# under the License. -# -# The Original Code is the Berkeley Open Infrastructure for Network Computing. -# -# The Initial Developer of the Original Code is the SETI@home project. -# Portions created by the SETI@home project are Copyright (C) 2002, 2003 -# University of California at Berkeley. All Rights Reserved. -# -# Contributor(s): -# - # testproxy - proxy a TCP/IP connection with configurable mid-way # disconnections, for simulating internet transfer failures diff --git a/tools/Makefile.in b/tools/Makefile.in index 02c68a25ea..24f5a54c47 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -135,12 +135,12 @@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -MYSQL_INCLUDES = /usr/local/mysql_32bit/include -MYSQL_INCLUDES2 = /usr/local/mysql_32bit/include/mysql +MYSQL_INCLUDES = /usr/local/mysql/include +MYSQL_INCLUDES2 = /usr/local/mysql/include/mysql MYSQL_INCLUDES3 = /usr/include/mysql MYSQL_LIBS = \ - -L/usr/local/mysql_32bit/lib -L/sw/lib/mysql -L/usr/local/lib/mysql \ + -L/usr/local/mysql/lib -L/sw/lib/mysql -L/usr/local/lib/mysql \ -lmysqlclient -L/usr/local/lib -lz \ -lm $(NETLIBS)