1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Apply Guilhem's patch (mmap->my_mmap, munmap->my_munmap in ha_tina) to improve

Browse Source 
portability.


sql/examples/ha_tina.cc:
  substitude mmap and munmap calls with their counterparts from mysys library
This commit is contained in:
unknown 2005-07-08 14:43:27 +04:00
parent dc9bf54505
commit 76b3ff2592
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sql/examples/ha_tina.cc
View File

@ -79,7 +79,8 @@ static byte* tina_get_key(TINA_SHARE *share,uint *length,
int get_mmap(TINA_SHARE *share, int write) int get_mmap(TINA_SHARE *share, int write)
{ {
DBUG_ENTER("ha_tina::get_mmap"); DBUG_ENTER("ha_tina::get_mmap");
if (share->mapped_file && munmap(share->mapped_file, share->file_stat.st_size)) if (share->mapped_file && my_munmap(share->mapped_file,
share->file_stat.st_size))
DBUG_RETURN(1); DBUG_RETURN(1);
if (my_fstat(share->data_file, &share->file_stat, MYF(MY_WME)) == -1) if (my_fstat(share->data_file, &share->file_stat, MYF(MY_WME)) == -1)
@ -88,13 +89,13 @@ int get_mmap(TINA_SHARE *share, int write)
if (share->file_stat.st_size) if (share->file_stat.st_size)
{ {
if (write) if (write)
share->mapped_file= (byte *)mmap(NULL, share->file_stat.st_size, share->mapped_file= (byte *)my_mmap(NULL, share->file_stat.st_size,
PROT_READ|PROT_WRITE, MAP_SHARED, PROT_READ|PROT_WRITE, MAP_SHARED,
share->data_file, 0); share->data_file, 0);
else else
share->mapped_file= (byte *)mmap(NULL, share->file_stat.st_size, share->mapped_file= (byte *)my_mmap(NULL, share->file_stat.st_size,
PROT_READ, MAP_PRIVATE, PROT_READ, MAP_PRIVATE,
share->data_file, 0); share->data_file, 0);
if ((share->mapped_file ==(caddr_t)-1)) if ((share->mapped_file ==(caddr_t)-1))
{ {
/* /*
@ -202,7 +203,7 @@ static int free_share(TINA_SHARE *share)
if (!--share->use_count){ if (!--share->use_count){
/* Drop the mapped file */ /* Drop the mapped file */
if (share->mapped_file) if (share->mapped_file)
munmap(share->mapped_file, share->file_stat.st_size); my_munmap(share->mapped_file, share->file_stat.st_size);
result_code= my_close(share->data_file,MYF(0)); result_code= my_close(share->data_file,MYF(0));
hash_delete(&tina_open_tables, (byte*) share); hash_delete(&tina_open_tables, (byte*) share);
thr_lock_delete(&share->lock); thr_lock_delete(&share->lock);
@ -760,7 +761,7 @@ int ha_tina::rnd_end()
if (my_chsize(share->data_file, length, 0, MYF(MY_WME))) if (my_chsize(share->data_file, length, 0, MYF(MY_WME)))
DBUG_RETURN(-1); DBUG_RETURN(-1);
if (munmap(share->mapped_file, length)) if (my_munmap(share->mapped_file, length))
DBUG_RETURN(-1); DBUG_RETURN(-1);
/* We set it to null so that get_mmap() won't try to unmap it */ /* We set it to null so that get_mmap() won't try to unmap it */