diff --git a/src/binding.cc b/src/binding.cc index 5253181b..54e4b4e0 100644 --- a/src/binding.cc +++ b/src/binding.cc @@ -243,9 +243,7 @@ public: connecting_ = false; TRACE("Initializing ev watchers"); - //ev_init(&read_watcher_, io_event); read_watcher_.data = this; - //ev_init(&write_watcher_, io_event); write_watcher_.data = this; } @@ -353,14 +351,10 @@ protected: PQsetNoticeProcessor(connection_, NoticeReceiver, this); + TRACE("Setting watchers to socket"); uv_poll_init(uv_default_loop(), &read_watcher_, fd); uv_poll_init(uv_default_loop(), &write_watcher_, fd); - TRACE("Setting watchers to socket"); - //uv_poll_start(uv_poll_t* handle, int events, uv_poll_cb cb) - //ev_io_set(&read_watcher_, fd, EV_READ); - //ev_io_set(&write_watcher_, fd, EV_WRITE); - connecting_ = true; StartWrite(); @@ -399,7 +393,7 @@ protected: TRACE("revents & EV_READ"); if(PQconsumeInput(connection_) == 0) { End(); - EmitLastError(); + EmitLastError(); LOG("Something happened, consume input is 0"); return; } @@ -623,7 +617,6 @@ private: void StopWrite() { TRACE("Stoping write watcher"); - //ev_io_stop(EV_DEFAULT_ &write_watcher_); uv_poll_stop(&write_watcher_); } @@ -631,20 +624,17 @@ private: { TRACE("Starting write watcher"); uv_poll_start(&write_watcher_, UV_WRITABLE, io_event); - //ev_io_start(EV_DEFAULT_ &write_watcher_); } void StopRead() { TRACE("Stoping read watcher"); - //ev_io_stop(EV_DEFAULT_ &read_watcher_); uv_poll_stop(&read_watcher_); } void StartRead() { TRACE("Starting read watcher"); - //ev_io_start(EV_DEFAULT_ &read_watcher_); uv_poll_start(&read_watcher_, UV_READABLE, io_event); } //Converts a v8 array to an array of cstrings