Changeset 41632

Timestamp:

Jun 2, 2021, 4:06:47 PM (5 years ago)

Author:

eugene

Message:

use grid for PS1; do not use ohana alloc for Shutdown

Location:

branches/eam_branches/relphot.20210521/src

Files:

• GridOps.c (modified) (1 diff)
• Shutdown.c (modified) (1 diff)

branches/eam_branches/relphot.20210521/src/GridOps.c

@@ -19 +19 @@
 static int                 NGridCorr = 0;
 
-// PS1: # define NX_CHIP 4900
-// PS1: # define NY_CHIP 4900
-// PS1: # define NX_BIN 16
-// PS1: # define NY_BIN 16
-
+# if (1)
+/* PS1 / PS2 values */
+# define NX_CHIP 4900
+# define NY_CHIP 4900
+# define NX_BIN 16
+# define NY_BIN 16
+# else
+/* test values */
 # define NX_CHIP 1000
 # define NY_CHIP 1000
 # define NX_BIN 2
 # define NY_BIN 2
+# endif
 
 void initGridBins (void) {

branches/eam_branches/relphot.20210521/src/Shutdown.c

@@ -10 +10 @@
 int Shutdown (char *format, ...) {  
   va_list argp;
-  char *formatplus;
+  char formatplus[1024];
   
-  ALLOCATE (formatplus, char, strlen(format));
-  strcpy (formatplus, format);
-  strcat (formatplus, "\n");
+  // we cannot allocate this with the ohana allocation tools
+  // because it could deadlock
+  snprintf (formatplus, 1024, "%s\n", format);
 
   va_start (argp, format);
   vfprintf (stderr, formatplus, argp);
-  free (formatplus);
   va_end (argp);