Removed fast write strategy

Author: mohanson

protocol/czar/engine.go

@@ -50,8 +50,6 @@ import (
 
 // Conf is acting as package level configuration.
 var Conf = struct {
-	// The newly created stream has a higher write priority.
-	FastWriteDuration time.Duration
 	// The duration a connection needs to be idle before mux begins sending out keep-alive probe.
 	IdleProbeDuration time.Duration
 	// If no data is read for more than this time, the connection is closed.
@@ -61,7 +59,6 @@ var Conf = struct {
 	// will be reduced.
 	PacketSize int
 }{
-	FastWriteDuration: time.Second * 8,
 	IdleProbeDuration: time.Second * 120,
 	IdleReplyDuration: time.Second * 128,
 	PacketSize:        2048,

protocol/czar/mux.go

@@ -12,7 +12,6 @@ import (
 
 // A Stream managed by the multiplexer.
 type Stream struct {
-	fwu time.Time
 	idx uint8
 	mux *Mux
 	rbf []byte
@@ -87,7 +86,6 @@ func (s *Stream) Write(p []byte) (int, error) {
 		buf []byte
 		l   = 0
 		n   = 0
-		z   = 1
 	)
 	for {
 		switch {
@@ -105,10 +103,7 @@ func (s *Stream) Write(p []byte) (int, error) {
 		binary.BigEndian.PutUint16(buf[2:4], uint16(l))
 		copy(buf[4:], p[:l])
 		p = p[l:]
-		if time.Now().After(s.fwu) {
-			z = 2
-		}
-		err := s.mux.pri.Pri(z, func() error {
+		err := s.mux.pri.Pri(1, func() error {
 			if err := s.wer.Get(); err != nil {
 				return err
 			}
@@ -129,7 +124,6 @@ func (s *Stream) Write(p []byte) (int, error) {
 // NewStream returns a new Stream.
 func NewStream(idx uint8, mux *Mux) *Stream {
 	return &Stream{
-		fwu: time.Now().Add(Conf.FastWriteDuration),
 		idx: idx,
 		mux: mux,
 		rbf: make([]byte, 0),
@@ -281,7 +275,7 @@ func NewMux(conn io.ReadWriteCloser) *Mux {
 		ach: make(chan *Stream),
 		con: conn,
 		idp: NewSip(),
-		pri: priority.NewPriority(3),
+		pri: priority.NewPriority(2),
 		rer: NewErr(),
 		usb: make([]*Stream, 256),
 	}