greg/bdberl
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fixes for 64bit Linux.

Browse source
This commit is contained in:
Phillip Toland 2008-12-12 15:26:20 -06:00
parent cf90e88428
commit 824ec5ef69
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Rakefile
View file

@ -22,7 +22,7 @@ end
rule ".o" => ["%X.c", "%X.h"] do |t|
puts "compiling #{t.source}..."
sh "gcc -g -c -Wall -Werror -Ic_src/system/include -I#{erts_dir()}/include #{t.source} -o #{t.name}", :verbose => false
sh "gcc -g -c -Wall -Werror -fPIC -Ic_src/system/include -I#{erts_dir()}/include #{t.source} -o #{t.name}", :verbose => false
end
task :compile_c => ['c_src'] + C_OBJS

12
c_src/bdberl_drv.c
View file

@ -234,7 +234,7 @@ static void bdberl_drv_stop(ErlDrvData handle)
{
printf("Cancelling async job for port: %p\n", d->port);
bdberl_tpool_cancel(d->async_pool, d->async_job);
driver_select(d->port, (ErlDrvEvent)d->pipe_fds[0], DO_READ, 0);
driver_select(d->port, (ErlDrvEvent)(size_t)d->pipe_fds[0], DO_READ, 0);
printf("Canceled async job for port: %p\n", d->port);
}
@ -376,7 +376,7 @@ static int bdberl_drv_control(ErlDrvData handle, unsigned int cmd,
if (cmd == CMD_TXN_COMMIT)
{
adata->payload = (void*) UNPACK_INT(inbuf, 0);
adata->payload = (void*)(size_t)UNPACK_INT(inbuf, 0);
}
// Update port data to indicate we have an operation in progress
@ -389,7 +389,7 @@ static int bdberl_drv_control(ErlDrvData handle, unsigned int cmd,
// Watch for events on the output pipe
// TODO: Can we do this just once ?!
driver_select(d->port, (ErlDrvEvent)d->pipe_fds[0], DO_READ, 1);
driver_select(d->port, (ErlDrvEvent)(size_t)d->pipe_fds[0], DO_READ, 1);
// Outbuf is <<Rc:32>>
RETURN_INT(0, outbuf);
@ -440,7 +440,7 @@ static int bdberl_drv_control(ErlDrvData handle, unsigned int cmd,
// Watch for events on the output pipe
// TODO: Can we do this just once ?!
driver_select(d->port, (ErlDrvEvent)d->pipe_fds[0], DO_READ, 1);
driver_select(d->port, (ErlDrvEvent)(size_t)d->pipe_fds[0], DO_READ, 1);
// Let caller know that the operation is in progress
// Outbuf is: <<0:32>>
@ -479,7 +479,7 @@ static void bdberl_drv_ready_input(ErlDrvData handle, ErlDrvEvent event)
// Empty out the queue
int readbuf;
while (read((int)event, &readbuf, sizeof(readbuf)) > 0) { ; }
while (read((size_t)event, &readbuf, sizeof(readbuf)) > 0) { ; }
driver_select(d->port, event, DO_READ, 0);
// The async op has completed running on the thread pool -- process the results
@ -855,7 +855,7 @@ static void do_async_txnop(void* arg)
// Execute the actual commit/abort
if (adata->port->async_op == CMD_TXN_COMMIT)
{
unsigned flags = (unsigned) adata->payload;
unsigned flags = (unsigned)(size_t)adata->payload;
adata->rc = adata->port->txn->commit(adata->port->txn, flags);
}
else