greg/stasis-aries-wal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add parens to comparators in allocationPolicy and dirtyPageTable.

Browse source
This commit is contained in:
Sears Russell 2009-08-23 00:32:50 +00:00
parent c4e80b41b5
commit 6562d6dd53
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/stasis/allocationPolicy.c
View file

@ -362,11 +362,11 @@ static int xidDealloced_remove(stasis_allocation_policy_t * ap, int xid, pageid_
static int availablePages_cmp_pageid(const void *ap, const void *bp, const void* ign) {
const availablePages_pageid_freespace *a = ap, *b = bp;
return a->pageid < b->pageid ? -1 : a->pageid > b->pageid ? 1 : 0;
return (a->pageid < b->pageid) ? -1 : (a->pageid > b->pageid) ? 1 : 0;
}
static int availablePages_cmp_freespace_pageid(const void *ap, const void *bp, const void* ign) {
const availablePages_pageid_freespace *a = ap, *b = bp;
return a->freespace < b->freespace ? -1 : a->freespace > b->freespace ? 1 : a->pageid < b->pageid ? -1 : a->pageid > b->pageid ? 1 : 0;
return (a->freespace < b->freespace) ? -1 : (a->freespace > b->freespace) ? 1 : (a->pageid < b->pageid) ? -1 : (a->pageid > b->pageid) ? 1 : 0;
}
int availablePages_lookup_by_freespace(stasis_allocation_policy_t *ap, size_t freespace, pageid_t *pageid) {
const availablePages_pageid_freespace query = { 0, freespace };
@ -381,23 +381,23 @@ int availablePages_lookup_by_freespace(stasis_allocation_policy_t *ap, size_t fr
static int pageOwners_cmp_pageid(const void *ap, const void *bp, const void* ign) {
const pageOwners_xid_freespace_pageid *a = ap, *b = bp;
return a->pageid < b->pageid ? -1 : a->pageid > b->pageid ? 1 : 0;
return (a->pageid < b->pageid) ? -1 : (a->pageid > b->pageid) ? 1 : 0;
}
static int pageOwners_cmp_xid_freespace_pageid(const void *ap, const void *bp, const void* ign) {
const pageOwners_xid_freespace_pageid *a = ap, *b = bp;
return a->xid < b->xid ? -1 : a->xid > b->xid ? 1 : a->freespace < b->freespace ? -1 : a->freespace > b->freespace ? 1 : a->pageid < b->pageid ? -1 : a->pageid > b->pageid ? 1 : 0;
return (a->xid < b->xid) ? -1 : (a->xid > b->xid) ? 1 : (a->freespace < b->freespace) ? -1 : (a->freespace > b->freespace) ? 1 : (a->pageid < b->pageid) ? -1 : (a->pageid > b->pageid) ? 1 : 0;
}
static int allPages_cmp_pageid(const void *ap, const void *bp, const void* ign) {
const allPages_pageid_freespace *a = ap, *b = bp;
return a->pageid < b->pageid ? -1 : a->pageid > b->pageid ? 1 : 0;
return (a->pageid < b->pageid) ? -1 : (a->pageid > b->pageid) ? 1 : 0;
}
static int xidAllocedDealloced_cmp_pageid_xid(const void *ap, const void *bp, const void* ign) {
const xidAllocedDealloced_xid_pageid *a = ap, *b = bp;
return a->pageid < b->pageid ? -1 : a->pageid > b->pageid ? 1 : a->xid < b->xid ? -1 : a->xid > b->xid ? 1 : 0;
return (a->pageid < b->pageid) ? -1 : (a->pageid > b->pageid) ? 1 : (a->xid < b->xid) ? -1 : (a->xid > b->xid) ? 1 : 0;
}
static int xidAllocedDealloced_cmp_xid_pageid(const void *ap, const void *bp, const void* ign) {
const xidAllocedDealloced_xid_pageid *a = ap, *b = bp;
return a->xid < b->xid ? -1 : a->xid > b->xid ? 1 : a->pageid < b->pageid ? -1 : a->pageid > b->pageid ? 1 : 0;
return (a->xid < b->xid) ? -1 : (a->xid > b->xid) ? 1 : (a->pageid < b->pageid) ? -1 : (a->pageid > b->pageid) ? 1 : 0;
}
stasis_allocation_policy_t * stasis_allocation_policy_init() {

2
src/stasis/dirtyPageTable.c
View file

@ -23,7 +23,7 @@ static int dpt_cmp(const void *ap, const void * bp, const void * ignored) {
const dpt_entry * a = ap;
const dpt_entry * b = bp;
return a->p < b->p ? -1 : (a->p == b->p ? 0 : 1);
return (a->p < b->p) ? -1 : ((a->p == b->p) ? 0 : 1);
}
struct stasis_dirty_page_table_t {