Skip to content
This repository has been archived by the owner on Mar 4, 2024. It is now read-only.

Fixes NewWriterLevel, tests #4

Merged
merged 1 commit into from
Jan 5, 2024
Merged

Fixes NewWriterLevel, tests #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 14 additions & 17 deletions isal_cgo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
)

var errReaderClosed = errors.New("Reader is closed")
var errCouldNotLoadLib = errors.New("Couls not load isal library")
var errCouldNotLoadLib = errors.New("could not load isal library")

const (
D_BUF_SIZE = 640 * 1024
Expand Down Expand Up @@ -92,12 +92,12 @@ type Reader struct {
func NewReader(in io.Reader) (*Reader, error) {

var err error
var ret bool
var ready bool

// load the isal library if not loaded by Ready()
if LIB_LOADED == 0 {
ret = Ready()
if ret == false {
ready = Ready()
if !ready {
return nil, errCouldNotLoadLib
}
}
Expand Down Expand Up @@ -137,18 +137,8 @@ type Writer struct {
// the first call to Write, Flush, or Close.

func NewWriter(w io.Writer) (*Writer, error) {

var ret bool
// load the isal library if not loaded by Ready()

if LIB_LOADED == 0 {
ret = Ready()
if ret == false {
return nil, errCouldNotLoadLib
}
}
z, _ := NewWriterLevel(w, DEFAULT_LEVEL)
return z, nil
z, err := NewWriterLevel(w, DEFAULT_LEVEL)
return z, err
}

// NewWriterLevel is like NewWriter but specifies the compression level instead
Expand All @@ -159,6 +149,13 @@ func NewWriter(w io.Writer) (*Writer, error) {
// The error returned will be nil if the level is valid.

func NewWriterLevel(w io.Writer, level int) (*Writer, error) {
var ready bool
if LIB_LOADED == 0 {
ready = Ready()
if !ready {
return nil, errCouldNotLoadLib
}
}

z := &Writer{
out: w,
Expand Down Expand Up @@ -333,7 +330,7 @@ func (z *Reader) Read(p []byte) (n int, err error) {
(*C.uint8_t)(unsafe.Pointer(&z.decompressionBuffer[0])), &avail_out, &totalOut, &state, &avail_in, HAS_GZIP_HEADER, &z.gzHeader[0])
}
if ret != 0 {
err = isalReturnCodeToError(ret)
z.err = isalReturnCodeToError(ret)
return 0, z.err
}

Expand Down
76 changes: 53 additions & 23 deletions isal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,19 +44,9 @@ var strGettysBurgAddress = "" +
"\n" +
"Abraham Lincoln, November 19, 1863, Gettysburg, Pennsylvania\n"

var bytesSimpleGzip = []byte{ // Hello World
0x1f, 0x8b, 0x08, 0x08, 0xc0, 0x6f, 0xb4, 0x63,
0x00, 0x03, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x2e,
0x74, 0x78, 0x74, 0x00, 0xf3, 0x48, 0xcd, 0xc9,
0xc9, 0x57, 0x08, 0xcf, 0x2f, 0xca, 0x49, 0x51,
0xe4, 0x02, 0x00, 0xdd, 0xdd, 0x14, 0x7d, 0x0d,
0x00, 0x00, 0x00,
}

var (
textTwain, _ = os.ReadFile("mt.txt")
textE, _ = os.ReadFile("e.txt")
text []byte
)

var suites = []struct{ name, file string }{
Expand Down Expand Up @@ -187,18 +177,18 @@ func TestDeflateInflate(t *testing.T) {
}

func TestRawReadSilesia(t *testing.T) {
fileName := "silesia.bin"
fileName := "Isaac.Newton-Opticks.txt"
inBuf := new(bytes.Buffer)
//outBuf := new(bytes.Buffer)
zoutBuf := new(bytes.Buffer)
nseg := 0

fin, err := os.OpenFile(fileName, os.O_RDONLY, 0755)
repeatReader := newRepeatReader(fin, 500)
if err != nil {
log.Fatalln(err)
}
// copy into a buffer
nfr, err := io.Copy(inBuf, fin)
nfr, err := io.Copy(inBuf, repeatReader)

if err != nil {
t.Fatal("could read input buffer:", err)
Expand Down Expand Up @@ -283,6 +273,10 @@ func runStringCompressTest(str string, t *testing.T) {
s := new(bytes.Buffer)
n, err := io.Copy(s, g)

if err != nil {
t.Errorf("TestFail: error failed to do io.Copy '%v'", err)
}

if s.String() != str {
t.Errorf("mismatch\n***expected***\n%q:%d bytes\n\n ***received***\n%q:%d", str, len(str), s, n)
}
Expand Down Expand Up @@ -337,23 +331,58 @@ func TestDecompressLongString(t *testing.T) {
runStringDecompressTest(str, t)
}

func TestSilesia(t *testing.T) {
type RepeatReader struct {
reader io.Reader
original io.Reader
repeatCount int
current int
}

// NewRepeatReader creates a new RepeatReader.
func newRepeatReader(reader io.Reader, repeatCount int) *RepeatReader {
return &RepeatReader{
reader: reader,
original: reader,
repeatCount: repeatCount,
current: 0,
}
}

// Read implements the io.Reader interface for RepeatReader.
func (r *RepeatReader) Read(p []byte) (int, error) {
if r.current >= r.repeatCount {
return 0, io.EOF // End of all repeats
}

n, err := r.reader.Read(p)
if err != nil {
if err == io.EOF && r.current < r.repeatCount-1 {
r.current++
r.reader = r.original // Reset the reader to the start for the next repeat
return r.Read(p) // Continue reading on next repeat
}
return n, err
}

return n, nil
}

func TestLong(t *testing.T) {
runtime.GC()
//fileName := "test.bin"
//fileName := "Isaac.Newton-Opticks.txt"
fileName := "silesia.bin"
fileName := "Isaac.Newton-Opticks.txt"
inBuf := new(bytes.Buffer)
outBuf := new(bytes.Buffer)
//outBuf := bytes.NewBuffer(make([]byte,0,128*2048*1024))
zoutBuf := new(bytes.Buffer)

fmt.Printf(" Mark Test\n")
fin, err := os.OpenFile(fileName, os.O_RDONLY, 0755)
repeatReader := newRepeatReader(fin, 500)
if err != nil {
log.Fatalln(err)
}
// copy into a buffer
nfr, err := io.Copy(inBuf, fin)
nfr, err := io.Copy(inBuf, repeatReader)

if err != nil {
t.Fatal("could read input buffer:", err)
Expand Down Expand Up @@ -420,17 +449,18 @@ func testDeflate(t *testing.T, r *rand.Rand, l int, src []byte) {
zin.Close()
}


func TestDeflateRandom(t *testing.T) {
for iter := 0; iter < 25; iter++ {
for l := 1; l < 7; l++ {
i := iter
t.Run(fmt.Sprintf("%d", i), func(t *testing.T) {
i, level := iter, l // Create a local copy of iter and l
t.Run(fmt.Sprintf("%d/%d", i, level), func(t *testing.T) {
t.Parallel()
r := rand.New(rand.NewSource(int64(i)))
n := r.Intn(16 << 20)
data := make([]byte, n)
_, _ = r.Read(data)
testDeflate(t, r, l, data)
testDeflate(t, r, level, data) // Use the local copy
})
}
}
Expand All @@ -455,14 +485,14 @@ func testInflate(t *testing.T, r *rand.Rand, l int, src []byte) {
func TestInflateRandom(t *testing.T) {
for iter := 0; iter < 25; iter++ {
for l := 1; l < 3; l++ {
i := iter
i, level := iter, l
t.Run(fmt.Sprintf("%d", i), func(t *testing.T) {
t.Parallel()
r := rand.New(rand.NewSource(int64(i)))
n := r.Intn(16 << 20)
data := make([]byte, n)
_, _ = r.Read(data)
testInflate(t, r, l, data)
testInflate(t, r, level, data)
})
}
}
Expand Down
Loading