Changeset d08c691 for lib

Timestamp:

07/27/10 17:05:51 (12 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

8608a0fa

Parents:

c69b593

Message:

• Actually check the return value of posix_memalign

File:

• lib/ior-peek.c (modified) (6 diffs)

lib/ior-peek.c

@@ -104 +104 @@
         /* Is the current buffer big enough? */
         if (DATA(io)->length < bytes_read) {
+                int res = 0;
+
                 if (DATA(io)->buffer)
                         free(DATA(io)->buffer);
@@ -109 +111 @@
                 DATA(io)->offset = 0;
 #if _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600
-                /* We need to do this as read() of O_DIRECT might happen into this buffer.
-                 * The docs suggest 512 bytes is all we need to align to, but I'm suspicious
-                 * I expect disks with 4k blocks will arrive soon, and thus 4k is the minimum I'm
-                 * willing to live with.
+                /* We need to do this as read() of O_DIRECT might happen into 
+                 * this buffer.  The docs suggest 512 bytes is all we need to 
+                 * align to, but I'm suspicious. I expect disks with 4k blocks 
+                 * will arrive soon, and thus 4k is the minimum I'm willing to 
+                 * live with.
                  */
-                posix_memalign(&DATA(io)->buffer, 4096, DATA(io)->length);
+                res = posix_memalign((void **)&DATA(io)->buffer, 4096, 
+                                DATA(io)->length);
+                if (res != 0) {
+                        fprintf(stderr, "Error aligning IO buffer: %d\n",
+                                        res);
+                        return res;
+                }
 #else
                 DATA(io)->buffer = malloc(DATA(io)->length);
@@ -210 +219 @@
 }
 
-static void *alignedrealloc(void *old, size_t oldsize, size_t size)
+static void *alignedrealloc(void *old, size_t oldsize, size_t size, int *res)
 {
 #if _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600
@@ -217 +226 @@
         if (size < oldsize)
                 return old;
-        posix_memalign(&new, 4096, size);
+        *res = posix_memalign(&new, 4096, size);
+        if (*res != 0) {
+                fprintf(stderr, "Error aligning IO buffer: %d\n", *res);
+                
+                return NULL;
+        }
         assert(oldsize<size);
         memcpy(new,old,oldsize);
@@ -231 +245 @@
 {
         off_t ret = 0;
+        int res = 0;
 
         /* Is there enough data in the buffer to serve this request? */
@@ -238 +253 @@
                 /* Round the read_amount up to the nearest MB */
                 read_amount += PEEK_SIZE - ((DATA(io)->length + read_amount) % PEEK_SIZE);
-                DATA(io)->buffer = alignedrealloc(DATA(io)->buffer, DATA(io)->length, 
-                        DATA(io)->length + read_amount);
+                DATA(io)->buffer = alignedrealloc(DATA(io)->buffer, 
+                        DATA(io)->length, 
+                        DATA(io)->length + read_amount, &res);
+
+                if (DATA(io)->buffer == NULL) {
+                        return res;     
+                }
+
                 /* Use the child reader to read more data into our managed
                  * buffer */