collabvm/r3
8
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #145 from Nordix/misaligned-address-error

Browse source 
Remove fixed alignment
This commit is contained in:
Yo-An Lin 2021-10-19 02:44:14 +08:00 committed by GitHub
commit 4f3c1cd994
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
include/r3.h
View file

@ -51,9 +51,7 @@ struct _node {
// the pointer of R3Route data // the pointer of R3Route data
void * data; void * data;
};
// almost less than 255
} __attribute__((aligned(64)));
#define r3_node_edge_pattern(node,i) node->edges.entries[i].pattern.base #define r3_node_edge_pattern(node,i) node->edges.entries[i].pattern.base
#define r3_node_edge_pattern_len(node,i) node->edges.entries[i].pattern.len #define r3_node_edge_pattern_len(node,i) node->edges.entries[i].pattern.len
@ -61,10 +59,9 @@ struct _node {
struct _edge { struct _edge {
r3_iovec_t pattern; // 8 bytes r3_iovec_t pattern; // 8 bytes
R3Node * child; // 8 bytes R3Node * child; // 8 bytes
// unsigned int pattern_len; // 4byte
unsigned int opcode; // 4byte unsigned int opcode; // 4byte
unsigned int has_slug; // 4byte unsigned int has_slug; // 4byte
} __attribute__((aligned(64))); };
struct _R3Route { struct _R3Route {
r3_iovec_t path; r3_iovec_t path;
@ -84,7 +81,7 @@ struct _R3Route {
int http_scheme; // can be (SCHEME_HTTP or SCHEME_HTTPS) int http_scheme; // can be (SCHEME_HTTP or SCHEME_HTTPS)
} __attribute__((aligned(64))); };
typedef struct _R3Entry match_entry; typedef struct _R3Entry match_entry;
struct _R3Entry { struct _R3Entry {
@ -98,7 +95,7 @@ struct _R3Entry {
r3_iovec_t remote_addr; r3_iovec_t remote_addr;
int http_scheme; int http_scheme;
} __attribute__((aligned(64))); };
R3Node * r3_tree_create(int cap); R3Node * r3_tree_create(int cap);