[boinc] 03/03: dropped app_ipc_uninitialised_A_reorder.patch
Guo Yixuan
yixuan-guest at moszumanska.debian.org
Tue Jun 24 03:38:41 UTC 2014
This is an automated email from the git hooks/post-receive script.
yixuan-guest pushed a commit to branch master
in repository boinc.
commit 8a005b25c165ac6ea674078e68624f49e46150e9
Author: Guo Yixuan <culu.gyx at gmail.com>
Date: Mon Jun 23 23:37:46 2014 -0400
dropped app_ipc_uninitialised_A_reorder.patch
not applied currently / out-of-date
---
.../patches/app_ipc_uninitialised_A_reorder.patch | 172 ---------------------
debian/patches/series | 4 -
2 files changed, 176 deletions(-)
diff --git a/debian/patches/app_ipc_uninitialised_A_reorder.patch b/debian/patches/app_ipc_uninitialised_A_reorder.patch
deleted file mode 100644
index 4f02369..0000000
--- a/debian/patches/app_ipc_uninitialised_A_reorder.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-Author: Steffen Moeller <moeller at debian.org>
-Description: Improving initalisation of app_init_data
-
-Index: boinc/lib/app_ipc.cpp
-===================================================================
---- boinc.orig/lib/app_ipc.cpp 2012-05-03 17:05:19.971488035 +0200
-+++ boinc/lib/app_ipc.cpp 2012-05-06 14:00:20.023220210 +0200
-@@ -56,12 +56,14 @@
- }
-
- APP_INIT_DATA::APP_INIT_DATA() : project_preferences(NULL) {
-+ gpu_type[0]=0;
-+ clear();
- }
-
- APP_INIT_DATA::~APP_INIT_DATA() {
- if (project_preferences) {
- free(project_preferences);
-- project_preferences=0; // paranoia
-+ project_preferences=NULL; // paranoia
- }
- }
-
-@@ -77,6 +79,12 @@
- }
-
- void APP_INIT_DATA::copy(const APP_INIT_DATA& a) {
-+
-+ clear(); // initialising values not copied, also avoiding memory leak in project_preferences
-+ if (a.project_preferences) {
-+ project_preferences = strdup(a.project_preferences);
-+ }
-+
- strcpy(app_name, a.app_name);
- strcpy(symstore, a.symstore);
- strcpy(acct_mgr_url, a.acct_mgr_url);
-@@ -87,7 +95,11 @@
- strcpy(wu_name, a.wu_name);
- strcpy(result_name, a.result_name);
- strcpy(authenticator, a.authenticator);
-- memcpy(&shmem_seg_name, &a.shmem_seg_name, sizeof(SHMEM_SEG_NAME));
-+#ifdef _WIN32
-+ memcpy(&shmem_seg_name, &a.shmem_seg_name, sizeof(SHMEM_SEG_NAME)); // character for Windows
-+#else
-+ shmem_seg_name = a.shmem_seg_name; // int for Linux
-+#endif
- strcpy(gpu_type, a.gpu_type);
-
- // use assignment for the rest, especially the classes
-@@ -122,11 +134,6 @@
- ncpus = a.ncpus;
- checkpoint_period = a.checkpoint_period;
- wu_cpu_time = a.wu_cpu_time;
-- if (a.project_preferences) {
-- project_preferences = strdup(a.project_preferences);
-- } else {
-- project_preferences = NULL;
-- }
- }
-
- int write_init_data_file(FILE* f, APP_INIT_DATA& ai) {
-@@ -202,16 +209,7 @@
- "<resource_share_fraction>%f</resource_share_fraction>\n"
- "<checkpoint_period>%f</checkpoint_period>\n"
- "<fraction_done_start>%f</fraction_done_start>\n"
-- "<fraction_done_end>%f</fraction_done_end>\n"
-- "<gpu_type>%s</gpu_type>\n"
-- "<gpu_device_num>%d</gpu_device_num>\n"
-- "<gpu_opencl_dev_index>%d</gpu_opencl_dev_index>\n"
-- "<ncpus>%f</ncpus>\n"
-- "<rsc_fpops_est>%f</rsc_fpops_est>\n"
-- "<rsc_fpops_bound>%f</rsc_fpops_bound>\n"
-- "<rsc_memory_bound>%f</rsc_memory_bound>\n"
-- "<rsc_disk_bound>%f</rsc_disk_bound>\n"
-- "<computation_deadline>%f</computation_deadline>\n",
-+ "<fraction_done_end>%f</fraction_done_end>\n",
- ai.slot,
- ai.wu_cpu_time,
- ai.starting_elapsed_time,
-@@ -223,10 +221,22 @@
- ai.resource_share_fraction,
- ai.checkpoint_period,
- ai.fraction_done_start,
-- ai.fraction_done_end,
-- ai.gpu_type,
-+ ai.fraction_done_end
-+ );
-+ fprintf(f,"<gpu_type>%s</gpu_type>\n", ai.gpu_type);
-+ fprintf(f,
-+ "<gpu_device_num>%d</gpu_device_num>\n"
-+ "<gpu_opencl_dev_index>%d</gpu_opencl_dev_index>\n",
- ai.gpu_device_num,
-- ai.gpu_opencl_dev_index,
-+ ai.gpu_opencl_dev_index
-+ );
-+ fprintf(f,
-+ "<ncpus>%f</ncpus>\n"
-+ "<rsc_fpops_est>%f</rsc_fpops_est>\n"
-+ "<rsc_fpops_bound>%f</rsc_fpops_bound>\n"
-+ "<rsc_memory_bound>%f</rsc_memory_bound>\n"
-+ "<rsc_disk_bound>%f</rsc_disk_bound>\n"
-+ "<computation_deadline>%f</computation_deadline>\n",
- ai.ncpus,
- ai.rsc_fpops_est,
- ai.rsc_fpops_bound,
-@@ -248,20 +258,27 @@
- minor_version = 0;
- release = 0;
- app_version = 0;
-- strcpy(app_name, "");
-- strcpy(symstore, "");
-- strcpy(acct_mgr_url, "");
-+
-+ if (project_preferences) {
-+ free(project_preferences);
-+ }
- project_preferences = NULL;
-+
- userid = 0;
- teamid = 0;
- hostid = 0;
-- strcpy(user_name, "");
-- strcpy(team_name, "");
-- strcpy(project_dir, "");
-- strcpy(boinc_dir, "");
-- strcpy(wu_name, "");
-- strcpy(result_name, "");
-- strcpy(authenticator, "");
-+
-+ app_name[0]=0;
-+ symstore[0]=0;
-+ acct_mgr_url[0]=0;
-+ user_name[0]=0;
-+ team_name[0]=0;
-+ project_dir[0]=0;
-+ boinc_dir[0]=0;
-+ wu_name[0]=0;
-+ result_name[0]=0;
-+ authenticator[0]=0;
-+
- slot = 0;
- user_total_credit = 0;
- user_expavg_credit = 0;
-@@ -281,12 +298,17 @@
- fraction_done_start = 0;
- fraction_done_end = 0;
- checkpoint_period = 0;
-- strcpy(gpu_type, "");
-+ gpu_type[0]=0;
- gpu_device_num = 0;
- // -1 means an older version without gpu_opencl_dev_index field
- gpu_opencl_dev_index = -1;
- ncpus = 0;
-- memset(&shmem_seg_name, 0, sizeof(shmem_seg_name));
-+#ifdef _WIN32
-+ //memset(&shmem_seg_name, 0, sizeof(shmem_seg_name));
-+ shmem_seg_name[0]=0;
-+#else
-+ shmem_seg_name=0;
-+#endif
- wu_cpu_time = 0;
- }
-
-@@ -491,7 +513,7 @@
- FILE *fp = boinc_fopen(virtual_name, "r");
- if (!fp) return 0;
- buf[0] = 0;
-- p = fgets(buf, 512, fp);
-+ p = fgets(buf, sizeof(buf), fp);
- fclose(fp);
- if (p) parse_str(buf, "<soft_link>", physical_name);
- return 0;
diff --git a/debian/patches/series b/debian/patches/series
index b51a9f2..e41b069 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,10 +10,6 @@ upstream_sztaki_configureEval.patch
disable_svn_version.patch
possible_size_type_error.patch
debian_debian_AdjustBoincTopdirPython.patch
-# --- A
-#send to David#
-#SETIprobCandidate#app_ipc_uninitialised_A_reorder.patch
-# --- B
some_extra_clang_warnings.patch
cppcheck_realloc.patch
MainDocumentWarnings.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-boinc/boinc.git
More information about the pkg-boinc-commits
mailing list