Changeset 38459

Timestamp:

Jun 12, 2015, 10:24:16 PM (11 years ago)

Author:

eugene

Message:

merge changes from EAM branch ipp-20150419

Location:

trunk/Ohana/src/libohana

Files:

• Makefile (modified) (1 diff)
• include/ohana.h (modified) (1 diff)
• src/bisection.c (copied) (copied from branches/eam_branches/ipp-20150419/Ohana/src/libohana/src/bisection.c )
• src/config.c (modified) (4 diffs)

trunk/Ohana/src/libohana/Makefile

@@ -34 +34 @@
 $(SRC)/ohana_allocate.$(ARCH).o  \
 $(SRC)/sorts.$(ARCH).o           \
+$(SRC)/bisection.$(ARCH).o       \
 $(SRC)/string.$(ARCH).o          \
 $(SRC)/findexec.$(ARCH).o        \

trunk/Ohana/src/libohana/include/ohana.h

@@ -479 +479 @@
 void VSHtermsForLM (VSHterms *terms, double R, double D, int l, int m);
 
-# endif
+/* in bisection.c */
+int ohana_bisection_double (double *values, int Nvalues, double threshold);
+
+# endif

trunk/Ohana/src/libohana/src/config.c

@@ -395 +395 @@
   Nbytes = 0;
   NBYTES = D_NBYTES;
-  ALLOCATE (ibuffer, char, NBYTES + 2);
-    
+  ALLOCATE_ZERO (ibuffer, char, NBYTES + 2);
+
   /* load data from file */
   while ((nbytes = fread (&ibuffer[Nbytes], sizeof(char), D_NBYTES, f)) == D_NBYTES) {
@@ -402 +402 @@
     NBYTES += D_NBYTES;
     REALLOCATE (ibuffer, char, NBYTES + 2);
+    memset (&ibuffer[NBYTES - D_NBYTES], 0, NBYTES - D_NBYTES + 2);
   }
   Nbytes += nbytes;
@@ -419 +420 @@
       Ncpy = strlen (line);
       if (Nbytes + Ncpy >= NBYTES) {
+        int Nbytes_old = NBYTES;
         NBYTES = Nbytes + Ncpy + D_NBYTES;
         REALLOCATE (ibuffer, char, NBYTES + 2);
+        memset (&ibuffer[Nbytes_old], 0, NBYTES + 2 - Nbytes_old);
       }    
       memcpy (&ibuffer[Nbytes], line, Ncpy);
@@ -430 +433 @@
       Ncpy = strlen (line);
       if (Nbytes + Ncpy >= NBYTES) {
+        int Nbytes_old = NBYTES;
         NBYTES = Nbytes + Ncpy + D_NBYTES;
         REALLOCATE (ibuffer, char, NBYTES + 2);
+        memset (&ibuffer[Nbytes_old], 0, NBYTES + 2 - Nbytes_old);
       }    
       memcpy (&ibuffer[Nbytes], line, Ncpy);