removed func version with new address specification

Author: anton-kuklin

unix/mremap_linux_test.go

@@ -26,44 +26,7 @@ func TestMremap(t *testing.T) {
 		t.Fatalf("Msync: %v", err)
 	}
 
-	bNew, err := unix.Mmap(-1, int64(unix.Getpagesize()*4), unix.Getpagesize(), unix.PROT_NONE, unix.MAP_ANON|unix.MAP_PRIVATE)
-	if err != nil {
-		t.Fatalf("Mmap: %v", err)
-	}
-
-	bRemapped, err := unix.Mremap(b, bNew, 0)
-	if err != nil {
-		t.Fatalf("Mremap: %v", err)
-	}
-	if &bRemapped[0] != &bNew[0] {
-		t.Fatal("bNew and bRemapped start at different pointers")
-	}
-	if bRemapped[0] != 42 {
-		t.Fatal("first element wasn't mapped")
-	}
-	if len(bNew) != len(bRemapped) {
-		t.Fatal("bNew len doesn't equal bRemapped len")
-	}
-	if cap(bNew) != cap(bRemapped) {
-		t.Fatal("bNew cap doesn't equal bRemapped len")
-	}
-}
-
-func TestMremap2(t *testing.T) {
-	b, err := unix.Mmap(-1, 0, unix.Getpagesize()*2, unix.PROT_NONE, unix.MAP_ANON|unix.MAP_PRIVATE)
-	if err != nil {
-		t.Fatalf("Mmap: %v", err)
-	}
-	if err := unix.Mprotect(b, unix.PROT_READ|unix.PROT_WRITE); err != nil {
-		t.Fatalf("Mprotect: %v", err)
-	}
-
-	b[0] = 42
-	if err := unix.Msync(b, unix.MS_SYNC); err != nil {
-		t.Fatalf("Msync: %v", err)
-	}
-
-	bNew, err := unix.Mremap2(b, unix.Getpagesize(), unix.MREMAP_MAYMOVE)
+	bNew, err := unix.Mremap(b, unix.Getpagesize(), unix.MREMAP_MAYMOVE)
 	if err != nil {
 		t.Fatalf("Mremap2: %v", err)
 	}

unix/syscall_linux.go

@@ -2141,12 +2141,8 @@ func Munmap(b []byte) (err error) {
 	return mapper.Munmap(b)
 }
 
-func Mremap(oldData []byte, newData []byte, flags int) (data []byte, err error) {
-	return mapper.Mremap(oldData, newData, flags)
-}
-
-func Mremap2(oldData []byte, newLength int, flags int) (data []byte, err error) {
-	return mapper.Mremap2(oldData, newLength, flags)
+func Mremap(oldData []byte, newLength int, flags int) (data []byte, err error) {
+	return mapper.Mremap(oldData, newLength, flags)
 }
 
 //sys	Madvise(b []byte, advice int) (err error)

unix/syscall_unix.go

@@ -148,33 +148,7 @@ func (m *mmapper) Munmap(data []byte) (err error) {
 	return nil
 }
 
-func (m *mmapper) Mremap(oldData []byte, newData []byte, flags int) (data []byte, err error) {
-	if len(oldData) == 0 || len(oldData) != cap(oldData) || len(newData) == 0 || len(newData) != cap(newData) {
-		return nil, EINVAL
-	}
-	flags |= MREMAP_MAYMOVE | MREMAP_FIXED
-
-	pOld := &oldData[cap(oldData)-1]
-	m.Lock()
-	defer m.Unlock()
-	bOld := m.active[pOld]
-	if bOld == nil || &bOld[0] != &oldData[0] {
-		return nil, EINVAL
-	}
-	newAddr, errno := m.mremap(uintptr(unsafe.Pointer(&bOld[0])), uintptr(len(bOld)), uintptr(len(newData)), flags, uintptr(unsafe.Pointer(&newData[0])))
-	if errno != nil {
-		return nil, errno
-	}
-	bNew := unsafe.Slice((*byte)(unsafe.Pointer(newAddr)), len(newData))
-	pNew := &bNew[cap(bNew)-1]
-	m.active[pNew] = bNew
-	if flags&MREMAP_DONTUNMAP == 0 {
-		delete(m.active, pOld)
-	}
-	return bNew, nil
-}
-
-func (m *mmapper) Mremap2(oldData []byte, newLength int, flags int) (data []byte, err error) {
+func (m *mmapper) Mremap(oldData []byte, newLength int, flags int) (data []byte, err error) {
 	if newLength <= 0 || len(oldData) == 0 || len(oldData) != cap(oldData) {
 		return nil, EINVAL
 	}