[move page info to page_info struct
John Meacham <john@repetae.net>**20100407041824
 Ignore-this: 4b3633e38de2552c0d9f3f52a35fa53c
] hunk ./src/data/rts/slub.c 11
-// #include "slub.h"
hunk ./src/data/rts/slub.c 12
-#define PAGESIZE 4096
+#define PAGESIZE  4096
hunk ./src/data/rts/slub.c 30
+struct s_page_info {
+        unsigned short color;
+        unsigned short size;
+};
+
hunk ./src/data/rts/slub.c 37
+        struct s_page_info pi;
hunk ./src/data/rts/slub.c 39
-        unsigned short color;
-        unsigned short size;
hunk ./src/data/rts/slub.c 45
-        struct s_arena *arena;
hunk ./src/data/rts/slub.c 47
+        struct s_page_info pi;
hunk ./src/data/rts/slub.c 49
-        unsigned short size;
hunk ./src/data/rts/slub.c 50
-        unsigned short color;
+        struct s_arena *arena;
hunk ./src/data/rts/slub.c 155
-                pg->color = sc->color;
-                pg->size = sc->size;
+                pg->pi = sc->pi;
hunk ./src/data/rts/slub.c 166
-        uintptr_t *pgp = (uintptr_t *)pg + pg->color;
-        void *val = &pgp[found * (pg->size/sizeof(uintptr_t))];
+        uintptr_t *pgp = (uintptr_t *)pg + pg->pi.color;
+        void *val = &pgp[found * (pg->pi.size/sizeof(uintptr_t))];
hunk ./src/data/rts/slub.c 175
-        //printf("s_alloc: val: %p s_page: %p size: %i color: %i found: %i num_free: %i\n", val, pg, pg->size, pg->color, found, pg->num_free);
+        //printf("s_alloc: val: %p s_page: %p size: %i color: %i found: %i num_free: %i\n", val, pg, pg->pi.size, pg->pi.color, found, pg->num_free);
hunk ./src/data/rts/slub.c 185
-        unsigned int offset = ((uintptr_t *)val - (uintptr_t *)pg) - pg->color;
-//        printf("s_free:  val: %p s_page: %p size: %i color: %i num_free: %i offset: %i bit: %i\n", val, pg, pg->size, pg->color, pg->num_free, offset, offset/pg->size);
-        assert(BIT_VALUE(pg->used,offset/(pg->size/sizeof(uintptr_t))));
-        BIT_UNSET(pg->used,offset/(pg->size/sizeof(uintptr_t)));
+        unsigned int offset = ((uintptr_t *)val - (uintptr_t *)pg) - pg->pi.color;
+//        printf("s_free:  val: %p s_page: %p size: %i color: %i num_free: %i offset: %i bit: %i\n", val, pg, pg->pi.size, pg->pi.color, pg->num_free, offset, offset/pg->pi.size);
+        assert(BIT_VALUE(pg->used,offset/(pg->pi.size/sizeof(uintptr_t))));
+        BIT_UNSET(pg->used,offset/(pg->pi.size/sizeof(uintptr_t)));
hunk ./src/data/rts/slub.c 198
-        sc->size = size;
+        sc->pi.size = size;
hunk ./src/data/rts/slub.c 202
-        sc->color = (sizeof(struct s_page) + BITARRAY_SIZE_IN_BYTES(sc->num_entries) + sizeof(uintptr_t) - 1) / sizeof(uintptr_t);
+        sc->pi.color = (sizeof(struct s_page) + BITARRAY_SIZE_IN_BYTES(sc->num_entries) + sizeof(uintptr_t) - 1) / sizeof(uintptr_t);
hunk ./src/data/rts/slub.c 240
-        unsigned int offset = ((uintptr_t *)val - (uintptr_t *)pg) - pg->color;
-        if(BIT_IS_UNSET(pg->used,offset/(pg->size/sizeof(uintptr_t)))) {
+        unsigned int offset = ((uintptr_t *)val - (uintptr_t *)pg) - pg->pi.color;
+        if(BIT_IS_UNSET(pg->used,offset/(pg->pi.size/sizeof(uintptr_t)))) {
hunk ./src/data/rts/slub.c 243
-                BIT_SET(pg->used,offset/(pg->size/sizeof(uintptr_t)));
+                BIT_SET(pg->used,offset/(pg->pi.size/sizeof(uintptr_t)));
hunk ./src/data/rts/slub.c 259
-                if(sc->size == size && sc->num_ptrs == num_ptrs)
+                if(sc->pi.size == size && sc->num_ptrs == num_ptrs)
hunk ./src/data/rts/slub.c 288
-        printf("  entries: %i bytes\n",(int)(sc->num_entries*sc->size));
+        printf("  entries: %i bytes\n",(int)(sc->num_entries*sc->pi.size));
hunk ./src/data/rts/slub.c 291
-        printf("  size: %i bytes\n",(int)sc->size);
-        printf("  color: %i words\n",(int)sc->color);
-        printf("  color_off: %i bytes\n",(int)(sc->color*sizeof(uintptr_t)));
-        printf("  end: %i bytes\n",(int)(sc->color*sizeof(uintptr_t) + sc->num_entries*sc->size));
+        printf("  size: %i bytes\n",(int)sc->pi.size);
+        printf("  color: %i words\n",(int)sc->pi.color);
+        printf("  color_off: %i bytes\n",(int)(sc->pi.color*sizeof(uintptr_t)));
+        printf("  end: %i bytes\n",(int)(sc->pi.color*sizeof(uintptr_t) + sc->num_entries*sc->pi.size));
hunk ./src/data/rts/slub.c 298
-            printf("%20p %9i %9i %9i %9i\n", pg, pg->num_free, pg->color, pg->size, pg->next_free);
+            printf("%20p %9i %9i %9i %9i\n", pg, pg->num_free, pg->pi.color, pg->pi.size, pg->next_free);
hunk ./src/data/rts/slub.c 302
-            printf("%20p %9i %9i %9i %9i\n", pg, pg->num_free, pg->color, pg->size, pg->next_free);
+            printf("%20p %9i %9i %9i %9i\n", pg, pg->num_free, pg->pi.color, pg->pi.size, pg->next_free);