gabehf/bimg
1
0
Fork 0
mirror of https://github.com/talgo-cloud/bimg.git synced 2026-03-15 18:35:54 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(#30): one concurrent thread by default

Browse source
This commit is contained in:
Tomas Aparicio 2015-04-15 02:25:57 +02:00
parent 6dbab52dbd
commit e111d875e7
3 changed files with 32 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
README.md
View file

@ -60,7 +60,7 @@ Here you can see some performance test comparisons for multiple scenarios:
#### Benchmarks #### Benchmarks
Tested using Go 1.4 and libvips-7.42.3 in OSX i7 2.7Ghz Tested using Go 1.4.2 and libvips-7.42.3 in OSX i7 2.7Ghz
``` ```
BenchmarkResizeLargeJpeg 50 43400480 ns/op BenchmarkResizeLargeJpeg 50 43400480 ns/op
BenchmarkResizePng 20 57592174 ns/op BenchmarkResizePng 20 57592174 ns/op
@ -237,6 +237,11 @@ Run the process passing the `DEBUG` environment variable
DEBUG=* ./app DEBUG=* ./app
``` ```
Enable libvips traces (note that a lot of data will be written in stdout):
```
VIPS_TRACE=1 ./app
```
#### func DetermineImageTypeName #### func DetermineImageTypeName
```go ```go

23
vips.go
View file

@ -9,6 +9,7 @@ import "C"
import ( import (
"errors" "errors"
"os"
"runtime" "runtime"
"strings" "strings"
"sync" "sync"
@ -68,9 +69,19 @@ func Initialize() {
panic("unable to start vips!") panic("unable to start vips!")
} }
C.vips_concurrency_set(0) // default C.vips_cache_set_max_mem(100 * 1024 * 1024)
C.vips_cache_set_max_mem(100 * 1024 * 1024) // 100 MB C.vips_cache_set_max(500)
C.vips_cache_set_max(500) // 500 operations
// Explicit concurrency limit to avoid thread-unsafe issues.
// See: https://github.com/jcupitt/libvips/issues/261#issuecomment-92850414
if os.Getenv("VIPS_CONCURRENCY") == "" {
C.vips_concurrency_set(1)
}
if os.Getenv("VIPS_TRACE") != "" {
C.vips_enable_cache_set_trace()
}
initialized = true initialized = true
} }
@ -113,7 +124,9 @@ func vipsHasProfile(image *C.struct__VipsImage) bool {
} }
func vipsWindowSize(name string) float64 { func vipsWindowSize(name string) float64 {
return float64(C.interpolator_window_size(C.CString(name))) cname := C.CString(name)
defer C.free(unsafe.Pointer(cname))
return float64(C.interpolator_window_size(cname))
} }
func vipsSpace(image *C.struct__VipsImage) string { func vipsSpace(image *C.struct__VipsImage) string {
@ -175,7 +188,7 @@ func vipsWatermark(image *C.struct__VipsImage, w Watermark) (*C.struct__VipsImag
defer C.free(unsafe.Pointer(text)) defer C.free(unsafe.Pointer(text))
defer C.free(unsafe.Pointer(font)) defer C.free(unsafe.Pointer(font))
err := C.vips_watermark(image, &out, (*C.watermarkTextOptions)(unsafe.Pointer(&textOpts)), (*C.watermarkOptions)(unsafe.Pointer(&opts))) err := C.vips_watermark(image, &out, (*C.WatermarkTextOptions)(unsafe.Pointer(&textOpts)), (*C.WatermarkOptions)(unsafe.Pointer(&opts)))
if err != 0 { if err != 0 {
return nil, catchVipsError() return nil, catchVipsError()
} }

11
vips.h
View file

@ -14,7 +14,7 @@ enum types {
typedef struct { typedef struct {
const char *Text; const char *Text;
const char *Font; const char *Font;
} watermarkTextOptions; } WatermarkTextOptions;
typedef struct { typedef struct {
int Width; int Width;
@ -23,7 +23,7 @@ typedef struct {
int NoReplicate; int NoReplicate;
float Opacity; float Opacity;
double Background[3]; double Background[3];
} watermarkOptions; } WatermarkOptions;
int int
vips_affine_interpolator(VipsImage *in, VipsImage **out, double a, double b, double c, double d, VipsInterpolate *interpolator) vips_affine_interpolator(VipsImage *in, VipsImage **out, double a, double b, double c, double d, VipsInterpolate *interpolator)
@ -187,7 +187,7 @@ vips_watermark_replicate(VipsImage *orig, VipsImage *in, VipsImage **out)
}; };
int int
vips_watermark(VipsImage *in, VipsImage **out, watermarkTextOptions *to, watermarkOptions *o) vips_watermark(VipsImage *in, VipsImage **out, WatermarkTextOptions *to, WatermarkOptions *o)
{ {
double ones[3] = { 1, 1, 1 }; double ones[3] = { 1, 1, 1 };
@ -244,3 +244,8 @@ vips_watermark(VipsImage *in, VipsImage **out, watermarkTextOptions *to, waterma
return 0; return 0;
}; };
void
vips_enable_cache_set_trace()
{
vips_cache_set_trace(TRUE);
};