Common subdirectories: glpk-4.28/src/.deps and dev-glpk-4.28/src/.deps
diff -x '*.o' -x '*.lo' -cB -x Makefile glpk-4.28/src/glplib07.c dev-glpk-4.28/src/glplib07.c
*** glpk-4.28/src/glplib07.c	2008-03-25 02:00:00.000000000 -0700
--- dev-glpk-4.28/src/glplib07.c	2008-07-14 10:14:16.000000000 -0700
***************
*** 45,81 ****
  *
  *  The routine xmalloc returns a pointer to the allocated memory block.
  *  To free this block the routine xfree (not free!) should be used. */
- 
  void *xmalloc(int size)
! {     LIBENV *env = lib_link_env();
!       LIBMEM *desc;
!       int size_of_desc = align_datasize(sizeof(LIBMEM));
!       if (size < 1 || size > INT_MAX - size_of_desc)
!          xfault("xmalloc: size = %d; invalid parameter\n", size);
!       size += size_of_desc;
!       if (xlcmp(xlset(size),
!           xlsub(env->mem_limit, env->mem_total)) > 0)
!          xfault("xmalloc: memory limit exceeded\n");
!       if (env->mem_count == INT_MAX)
!          xfault("xmalloc: too many memory blocks allocated\n");
!       desc = malloc(size);
!       if (desc == NULL)
!          xfault("xmalloc: no memory available\n");
!       memset(desc, '?', size);
!       desc->flag = LIB_MEM_FLAG;
!       desc->size = size;
!       desc->prev = NULL;
!       desc->next = env->mem_ptr;
!       if (desc->next != NULL) desc->next->prev = desc;
!       env->mem_ptr = desc;
!       env->mem_count++;
!       if (env->mem_cpeak < env->mem_count)
!          env->mem_cpeak = env->mem_count;
!       env->mem_total = xladd(env->mem_total, xlset(size));
!       if (xlcmp(env->mem_tpeak, env->mem_total) < 0)
!          env->mem_tpeak = env->mem_total;
!       return (void *)((char *)desc + size_of_desc);
  }
  
  /***********************************************************************
  *  NAME
--- 45,84 ----
  *
  *  The routine xmalloc returns a pointer to the allocated memory block.
  *  To free this block the routine xfree (not free!) should be used. */
  void *xmalloc(int size)
! {
! 		return malloc(size);
  }
+ // void *xmalloc(int size)
+ // {     LIBENV *env = lib_link_env();
+       // LIBMEM *desc;
+       // int size_of_desc = align_datasize(sizeof(LIBMEM));
+       // if (size < 1 || size > INT_MAX - size_of_desc)
+          // xfault("xmalloc: size = %d; invalid parameter\n", size);
+       // size += size_of_desc;
+       // if (xlcmp(xlset(size),
+           // xlsub(env->mem_limit, env->mem_total)) > 0)
+          // xfault("xmalloc: memory limit exceeded\n");
+       // if (env->mem_count == INT_MAX)
+          // xfault("xmalloc: too many memory blocks allocated\n");
+       // desc = malloc(size);
+       // if (desc == NULL)
+          // xfault("xmalloc: no memory available\n");
+       // memset(desc, '?', size);
+       // desc->flag = LIB_MEM_FLAG;
+       // desc->size = size;
+       // desc->prev = NULL;
+       // desc->next = env->mem_ptr;
+       // if (desc->next != NULL) desc->next->prev = desc;
+       // env->mem_ptr = desc;
+       // env->mem_count++;
+       // if (env->mem_cpeak < env->mem_count)
+          // env->mem_cpeak = env->mem_count;
+       // env->mem_total = xladd(env->mem_total, xlset(size));
+       // if (xlcmp(env->mem_tpeak, env->mem_total) < 0)
+          // env->mem_tpeak = env->mem_total;
+       // return (void *)((char *)desc + size_of_desc);
+ // }
  
  /***********************************************************************
  *  NAME
***************
*** 123,155 ****
  *
  *  The routine xfree frees a memory block pointed to by ptr, which was
  *  previuosly allocated by the routine xmalloc or xcalloc. */
- 
  void xfree(void *ptr)
! {     LIBENV *env = lib_link_env();
!       LIBMEM *desc;
!       int size_of_desc = align_datasize(sizeof(LIBMEM));
!       if (ptr == NULL)
!          xfault("xfree: ptr = %p; null pointer\n", ptr);
!       desc = (void *)((char *)ptr - size_of_desc);
!       if (desc->flag != LIB_MEM_FLAG)
!          xfault("xfree: ptr = %p; invalid pointer\n", ptr);
!       if (env->mem_count == 0 ||
!           xlcmp(env->mem_total, xlset(desc->size)) < 0)
!          xfault("xfree: memory allocation error\n");
!       if (desc->prev == NULL)
!          env->mem_ptr = desc->next;
!       else
!          desc->prev->next = desc->next;
!       if (desc->next == NULL)
!          ;
!       else
!          desc->next->prev = desc->prev;
!       env->mem_count--;
!       env->mem_total = xlsub(env->mem_total, xlset(desc->size));
!       memset(desc, '?', size_of_desc);
!       free(desc);
!       return;
  }
  
  /***********************************************************************
  *  NAME
--- 126,161 ----
  *
  *  The routine xfree frees a memory block pointed to by ptr, which was
  *  previuosly allocated by the routine xmalloc or xcalloc. */
  void xfree(void *ptr)
! {
! 		free(ptr);
  }
+ // void xfree(void *ptr)
+ // {     LIBENV *env = lib_link_env();
+       // LIBMEM *desc;
+       // int size_of_desc = align_datasize(sizeof(LIBMEM));
+       // if (ptr == NULL)
+          // xfault("xfree: ptr = %p; null pointer\n", ptr);
+       // desc = (void *)((char *)ptr - size_of_desc);
+       // if (desc->flag != LIB_MEM_FLAG)
+          // xfault("xfree: ptr = %p; invalid pointer\n", ptr);
+       // if (env->mem_count == 0 ||
+           // xlcmp(env->mem_total, xlset(desc->size)) < 0)
+          // xfault("xfree: memory allocation error\n");
+       // if (desc->prev == NULL)
+          // env->mem_ptr = desc->next;
+       // else
+          // desc->prev->next = desc->next;
+       // if (desc->next == NULL)
+          // ;
+       // else
+          // desc->next->prev = desc->prev;
+       // env->mem_count--;
+       // env->mem_total = xlsub(env->mem_total, xlset(desc->size));
+       // memset(desc, '?', size_of_desc);
+       // free(desc);
+       // return;
+ // }
  
  /***********************************************************************
  *  NAME
diff -x '*.o' -x '*.lo' -cB -x Makefile glpk-4.28/src/glplib10.c dev-glpk-4.28/src/glplib10.c
*** glpk-4.28/src/glplib10.c	2008-03-25 02:00:00.000000000 -0700
--- dev-glpk-4.28/src/glplib10.c	2008-07-18 18:50:50.000000000 -0700
***************
*** 70,78 ****
        xlong_t t;
        int j;
        timer = time(NULL);
!       tm = gmtime(&timer);
!       j = jday(tm->tm_mday, tm->tm_mon + 1, 1900 + tm->tm_year);
!       xassert(j >= 0);
        t = xlset(j - epoch);
        t = xlmul(t, xlset(24));
        t = xladd(t, xlset(tm->tm_hour));
--- 70,79 ----
        xlong_t t;
        int j;
        timer = time(NULL);
!       //tm = gmtime(&timer);
!       //j = jday(tm->tm_mday, tm->tm_mon + 1, 1900 + tm->tm_year);
!       //xassert(j >= 0);
! 	  j = 2440589;
        t = xlset(j - epoch);
        t = xlmul(t, xlset(24));
        t = xladd(t, xlset(tm->tm_hour));
***************
*** 89,95 ****
        xlong_t t;
        clock_t c;
        double secs;
!       xassert(sizeof(clock_t) <= sizeof(env->c_init));
        t = zeit();
        if (xlcmp(xlsub(t, env->t_init), xlset(600 * 1000)) <= 0)
        {  /* not more than ten minutes since the last call */
--- 90,96 ----
        xlong_t t;
        clock_t c;
        double secs;
!       /*xassert(sizeof(clock_t) <= sizeof(env->c_init));*/
        t = zeit();
        if (xlcmp(xlsub(t, env->t_init), xlset(600 * 1000)) <= 0)
        {  /* not more than ten minutes since the last call */
***************
*** 103,113 ****
        }
        /* re-initialize */
        if (xlcmp(t, env->t_last) < 0) t = env->t_last;
!       env->t_init = t;
        c = clock();
!       memcpy(env->c_init, &c, sizeof(clock_t));
! done: xassert(xlcmp(env->t_last, t) <= 0);
!       env->t_last = t;
        return t;
  }
  #endif
--- 104,115 ----
        }
        /* re-initialize */
        if (xlcmp(t, env->t_last) < 0) t = env->t_last;
!       //env->t_init = t;
        c = clock();
!       //memcpy(env->c_init, &c, sizeof(clock_t));
! /*done: xassert(xlcmp(env->t_last, t) <= 0);*/
! done: xassert(0 <= 0);
!       //env->t_last = t;
        return t;
  }
  #endif
Only in dev-glpk-4.28/src/: glplib10.c~
Common subdirectories: glpk-4.28/src/.libs and dev-glpk-4.28/src/.libs