Bump github.com/sasha-s/go-deadlock from 0.2.0 to 0.3.1

Bumps [github.com/sasha-s/go-deadlock](https://github.com/sasha-s/go-deadlock) from 0.2.0 to 0.3.1.
- [Release notes](https://github.com/sasha-s/go-deadlock/releases)
- [Commits](sasha-s/go-deadlock@v0.2.0...v0.3.1)

---
updated-dependencies:
- dependency-name: github.com/sasha-s/go-deadlock
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Author: dependabot[bot]

.cirrus.yml

@@ -1,7 +1,7 @@
 ---
 cirrus-ci_task:
   container:
-    image: toxchat/toktok-stack:0.0.27-third_party
+    image: toxchat/toktok-stack:0.0.31-third_party
     cpu: 2
     memory: 4G
   configure_script:

go.mod

@@ -3,7 +3,6 @@ module github.com/TokTok/go-toxcore-c
 go 1.12
 
 require (
-	github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
-	github.com/sasha-s/go-deadlock v0.2.0
+	github.com/sasha-s/go-deadlock v0.3.1
 	github.com/streamrail/concurrent-map v0.0.0-20160823150647-8bf1e9bacbf6
 )

go.sum

@@ -1,6 +1,6 @@
 github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 h1:q2e307iGHPdTGp0hoxKjt1H5pDo6utceo3dQVK3I5XQ=
 github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o=
-github.com/sasha-s/go-deadlock v0.2.0 h1:lMqc+fUb7RrFS3gQLtoQsJ7/6TV/pAIFvBsqX73DK8Y=
-github.com/sasha-s/go-deadlock v0.2.0/go.mod h1:StQn567HiB1fF2yJ44N9au7wOhrPS3iZqiDbRupzT10=
+github.com/sasha-s/go-deadlock v0.3.1 h1:sqv7fDNShgjcaxkO0JNcOAlr8B9+cV5Ey/OB71efZx0=
+github.com/sasha-s/go-deadlock v0.3.1/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM=
 github.com/streamrail/concurrent-map v0.0.0-20160823150647-8bf1e9bacbf6 h1:XklXvOrWxWCDX2n4vdEQWkjuIP820XD6C4kF0O0FzH4=
 github.com/streamrail/concurrent-map v0.0.0-20160823150647-8bf1e9bacbf6/go.mod h1:yqDD2twFAqxvvH5gtpwwgLsj5L1kbNwtoPoDOwBzXcs=

tox.go

@@ -76,6 +76,7 @@ type cb_file_chunk_request_ftype func(this *Tox, friend_number uint32, file_numb
 type Tox struct {
 	opts       *ToxOptions
 	toxcore    *C.Tox // save C.Tox
+	Killed     bool
 	threadSafe bool
 	mu         deadlock.RWMutex
 	// mu sync.RWMutex
@@ -527,6 +528,7 @@ func (this *Tox) Kill() {
 	cbUserDatas.del(this.toxcore)
 	C.tox_kill(this.toxcore)
 	this.toxcore = nil
+	this.Killed = true
 }
 
 // uint32_t tox_iteration_interval(Tox *tox);
@@ -543,6 +545,12 @@ func (this *Tox) IterationInterval() int {
 // compatable with legacy version
 func (this *Tox) Iterate() {
 	this.lock()
+	if this.Killed {
+		log.Panic("Tox was already killed")
+	}
+	if this.toxcore == nil {
+		log.Panic("toxcore became nil")
+	}
 	C.tox_iterate(this.toxcore, nil)
 	cbevts := this.cbevts
 	this.cbevts = nil
@@ -554,6 +562,9 @@ func (this *Tox) Iterate() {
 // for toktok new method
 func (this *Tox) Iterate2(userData interface{}) {
 	this.lock()
+	if this.toxcore == nil {
+		log.Panic("toxcore became nil")
+	}
 	this.cb_iterate_data = userData
 	C.tox_iterate(this.toxcore, nil)
 	this.cb_iterate_data = nil

tox_test.go

@@ -914,9 +914,16 @@ func TestCommunication(t *testing.T) {
 		opts.ThreadSafe = true
 		opts.Tcp_port = 34567
 		_t1 := NewTox(opts)
+		if _t1 == nil {
+			t.Error("NewTox failed")
+		}
+		defer _t1.Kill()
 		log.Println(_t1)
 		go func() {
 			for {
+				if _t1.Killed {
+					return
+				}
 				_t1.Iterate()
 				time.Sleep(100 * time.Millisecond)
 			}
@@ -926,12 +933,19 @@ func TestCommunication(t *testing.T) {
 		opts2.ThreadSafe = true
 		opts2.Tcp_port = 34568
 		_t2 := NewTox(opts2)
+		if _t2 == nil {
+			t.Error("NewTox failed")
+		}
+		defer _t2.Kill()
 		log.Println(_t2)
 		_t2.CallbackGroupInviteAdd(func(_ *Tox, friendNumber uint32, itype uint8, data string, userData interface{}) {
 			log.Println(friendNumber, itype)
 		}, nil)
 		go func() {
 			for {
+				if _t2.Killed {
+					return
+				}
 				_t2.Iterate()
 				time.Sleep(100 * time.Millisecond)
 			}

toxav.go

@@ -316,7 +316,7 @@ func callbackAudioForC(m *C.Tox, groupnumber C.uint32_t, peernumber C.uint32_t,
 }
 
 func (this *Tox) AddAVGroupChat(cbfn cb_audio_ftype) uint32 {
-	r := C.toxav_add_av_groupchat(this.toxcore, (*[0]byte)(unsafe.Pointer(C.callbackAudioForC)), nil)
+	r := C.toxav_add_av_groupchat(this.toxcore, (*C.toxav_audio_data_cb)(unsafe.Pointer(C.callbackAudioForC)), nil)
 	if cbfn != nil {
 		this.cb_audios[uint32(r)] = cbfn
 	}
@@ -335,7 +335,7 @@ func (this *Tox) JoinAVGroupChat(friendNumber uint32, cookie string, cbfn cb_aud
 	var _length = C.uint16_t(length)
 
 	r := C.toxav_join_av_groupchat(this.toxcore, _fn, _data, _length,
-		(*[0]byte)(unsafe.Pointer(C.callbackAudioForC)), nil)
+		(*C.toxav_audio_data_cb)(unsafe.Pointer(C.callbackAudioForC)), nil)
 	if int(r) == -1 {
 		return uint32(r), errors.New("Join av group chat failed")
 	}