Changeset 1685


Ignore:
Timestamp:
01/11/11 13:17:19 (2 years ago)
Author:
salcock
Message:
  • Ensure that off_t is a consistent size across all components of libtrace IO - this should fix the threading issue on 32-bit systems.
  • Revert previous band-aid fix as it is no longer necessary.
Location:
trunk/lib
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/lib/ior-thread.c

    r1681 r1685  
    7676        int in_buffer; 
    7777        /* The read offset into the current buffer */ 
    78         int offset; 
     78        off_t offset; 
    7979        /* The reading thread */ 
    8080        pthread_t producer; 
    … …  
    192192} 
    193193 
    194 static off_t thread_read(io_t *state, void *buffer, const off_t to_read) 
     194static off_t thread_read(io_t *state, void *buffer, off_t len) 
    195195{ 
    196196        int slice; 
    197197        int copied=0; 
    198198        int newbuffer; 
    199         int len = to_read; 
    200199 
    201200        while(len>0) { 

  • trunk/lib/ior-zlib.c

    r1626 r1685  
    3333 
    3434 
     35#include "wandio.h" 
    3536#include <zlib.h> 
    36 #include "wandio.h" 
    3737#include <sys/types.h> 
    3838#include <sys/stat.h> 

  • trunk/lib/wandio.h

    r1562 r1685  
    3434#ifndef IO_H  
    3535#define IO_H 1 /**< Guard Define */ 
     36#include "config.h" 
    3637#include <sys/types.h> 
    3738#include <stdio.h> 
Note: See TracChangeset for help on using the changeset viewer.