Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

license 

svn path=/trunk/boinc/; revision=1676
This commit is contained in:
David Anderson 2003-07-15 18:19:29 +00:00
parent eafb60f64a
commit 0a7f0e285b
24 changed files with 106 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -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.

8
Makefile.incl
View File

@ -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)

14
api/boinc_api.C
View File

@ -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,
"<fraction_done>%2.8f</fraction_done>\n"
"<current_cpu_time>%10.4f</current_cpu_time>\n"
"<checkpoint_cpu_time>%10.4f</checkpoint_cpu_time>\n"
"<working_set_size>%d</working_set_size>\n",
"<working_set_size>%f</working_set_size>\n",
frac_done, cpu_t, cp_cpu_t, ws_t
);

5
api/boinc_api.h
View File

@ -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();

4
api/gutil.cpp
View File

@ -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

10
checkin_notes
View File

@ -5322,4 +5322,12 @@ John Brian 2003/07/11
project.inc
user.inc
util.inc
view_profile.php (new)
view_profile.php (new)
David July 15 2003
- use double for VM working set size
- finished replacing license text
api/
boinc_api.C,h

18
client/mac/mac_about.h
View File

@ -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):
//

18
client/mac/mac_join.h
View File

@ -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):
//

4
client/win/hostinfo_win.cpp
View File

@ -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

18
client/win/windows_cpp.h
View File

@ -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):
//

4
client/win/wingui.cpp
View File

@ -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

4
client/win/wingui_listctrl.cpp
View File

@ -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

4
client/win/wingui_listctrl.h
View File

@ -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

4
client/win/wingui_mainwindow.cpp
View File

@ -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

4
client/win/wingui_mainwindow.h
View File

@ -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

6
client/win/wingui_sswindow.cpp
View File

@ -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();
}
}
}

4
client/win/wingui_sswindow.h
View File

@ -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

1
doc/index.html
View File

@ -52,6 +52,7 @@ Help debug and enhance the BOINC software.
&nbsp;&nbsp;&nbsp;
<a href=http://www.equn.com/boinchina><font size=-1>Chinese</font></a>
<a href=http://boinc.tmac.pri.ee><font size=-1>Estonian</font></a>
<a href=http://www.boinc.dk><font size=-1>Danish</font></a>
<a href=http://www.boinc-fr.net><font size=-1>French</font></a>
<a href=http://www.boinc.de/><font size=-1>German</font></a>
<a href=http://www.boinc.narod.ru><font size=-1>Russian</font></a>

23
doc/license_1.0.txt
View File

@ -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,

10
lib/app_ipc.h
View File

@ -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;
};

18
lib/messages.C
View File

@ -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):
//

18
sched/sched_messages.C
View File

@ -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):
//

19
test/testproxy
View File

@ -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

6
tools/Makefile.in
View File

@ -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)