From: Ian Lynagh <igloo@earth.li>
Date: Tue, 1 Jul 2008 12:43:20 +0000 (+0000)
Subject: Allow the exact HPC tix filename to be given in the HPCTIXFILE env var
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=073a9255cbe13e4dfb10b6d6090e4696453c4881;p=ghc-hetmet.git

Allow the exact HPC tix filename to be given in the HPCTIXFILE env var
---

diff --git a/rts/Hpc.c b/rts/Hpc.c
index 1624079..a6e854b 100644
--- a/rts/Hpc.c
+++ b/rts/Hpc.c
@@ -174,14 +174,20 @@ readTix(void) {
 
 static void hpc_init(void) {
   char *hpc_tixdir;
+  char *hpc_tixfile;
   if (hpc_inited != 0) {
     return;
   }
   hpc_inited = 1;
   hpc_pid    = getpid();
   hpc_tixdir = getenv("HPCTIXDIR");
+  hpc_tixfile = getenv("HPCTIXFILE");
 
-  if (hpc_tixdir != NULL) {
+  /* XXX Check results of mallocs/strdups, and check we are requesting
+         enough bytes */
+  if (hpc_tixfile != NULL) {
+    tixFilename = strdup(hpc_tixfile);
+  } else if (hpc_tixdir != NULL) {
     /* Make sure the directory is present;
      * conditional code for mkdir lifted from lndir.c
      */