Changeset 99692c for src/Jobs/JobMarket/SystemCommandJob.cpp

Timestamp:

Jul 13, 2014, 6:05:03 PM (11 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

abfc95

Parents:

d6a7b9

git-author:

Frederik Heber <heber@…> (07/12/14 23:17:29)

git-committer:

Frederik Heber <heber@…> (07/13/14 18:05:03)

Message:

FIX: Preparation of temporary filename in SystemCommandJob now working correctly.

File:

• src/Jobs/JobMarket/SystemCommandJob.cpp (modified) (2 diffs)

src/Jobs/JobMarket/SystemCommandJob.cpp

@@ -112 +112 @@
 
   // the following is taken from http://stackoverflow.com/questions/2746168/how-to-construct-a-c-fstream-from-a-posix-file-descriptor
-  char tmpTemplate[24];
-  strncpy(tmpTemplate, "/tmp/XXXXXX_", 14);
+  char *tmpTemplate = NULL;
   const std::string idstring(toString(getId()));
   const size_t idlength = idstring.length();
-  ASSERT(idlength <= 8,
-    "SystemCommandJob::Work() - the id contains more than 8 digits.");
-  strcat(tmpTemplate, toString(getId()).c_str());
-  const int fd = mkstemps(tmpTemplate, idlength+1);
+  {
+    std::string Template("/tmp/XXXXXXX_");
+    ASSERT(idlength <= 8,
+      "SystemCommandJob::Work() - the id contains more than 8 digits.");
+    Template += idstring;
+    if (!suffix.empty())
+      Template += suffix;
+    LOG(2, "DEBUG: Temporary template is " << Template << ".");
+    tmpTemplate = new char[Template.length()+1];
+    strncpy(tmpTemplate, Template.c_str(), Template.length()+1);
+  }
+  const int fd = mkstemps(tmpTemplate, idlength + suffix.length()+1);
 
   // write outputfile to temporary file
@@ -175 +182 @@
     boost::filesystem::remove(tmpPath);
   }
+  delete[] tmpTemplate;
   // close temporary file!
   close(fd);