output: fix misuse of unsafe.Pointer

l2dy · l2dy · commit 995e6baa9ec8 · 2020-03-28T04:23:45.000Z
Closes #18. Signed-off-by: Zero King <l2dy@icloud.com>
diff --git a/output/output.go b/output/output.go
@@ -69,15 +69,15 @@ func FLBPluginConfigKey(plugin unsafe.Pointer, key string) string {
 	return value
 }
 
-var contexts []interface{}
+var contexts = make(map[uintptr]interface{})
 
 func FLBPluginSetContext(plugin unsafe.Pointer, ctx interface{}) {
-	i := len(contexts)
-	contexts = append(contexts, ctx)
+	i := unsafe.Pointer(C.CString(""))
+	contexts[uintptr(i)] = ctx
 	p := (*FLBOutPlugin)(plugin)
-	p.context.remote_context = unsafe.Pointer(uintptr(i))
+	p.context.remote_context = i
 }
 
 func FLBPluginGetContext(i unsafe.Pointer) interface{} {
-	return contexts[int(uintptr(i))]
+	return contexts[uintptr(i)]
 }

Original file line number	Diff line number	Diff line change
`@@ -69,15 +69,15 @@ func FLBPluginConfigKey(plugin unsafe.Pointer, key string) string {`
`69`	`69`	`return value`
`70`	`70`	`}`
`71`	`71`
`72`		`-var contexts []interface{}`
	`72`	`+var contexts = make(map[uintptr]interface{})`
`73`	`73`
`74`	`74`	`func FLBPluginSetContext(plugin unsafe.Pointer, ctx interface{}) {`
`75`		`- i := len(contexts)`
`76`		`- contexts = append(contexts, ctx)`
	`75`	`+ i := unsafe.Pointer(C.CString(""))`
	`76`	`+ contexts[uintptr(i)] = ctx`
`77`	`77`	`p := (*FLBOutPlugin)(plugin)`
`78`		`- p.context.remote_context = unsafe.Pointer(uintptr(i))`
	`78`	`+ p.context.remote_context = i`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`func FLBPluginGetContext(i unsafe.Pointer) interface{} {`
`82`		`- return contexts[int(uintptr(i))]`
	`82`	`+ return contexts[uintptr(i)]`
`83`	`83`	`}`