Skip to content

Commit

Permalink
go.mod - revert module back to lirm for PR to upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
Kelly Wilson committed Apr 28, 2022
1 parent 64db2ad commit 09fd749
Show file tree
Hide file tree
Showing 66 changed files with 246 additions and 217 deletions.
12 changes: 6 additions & 6 deletions aeron/aeron.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ package aeron
import (
"time"

"github.com/corymonroe-coinbase/aeron-go/aeron/broadcast"
"github.com/corymonroe-coinbase/aeron-go/aeron/counters"
"github.com/corymonroe-coinbase/aeron-go/aeron/driver"
"github.com/corymonroe-coinbase/aeron-go/aeron/logging"
rb "github.com/corymonroe-coinbase/aeron-go/aeron/ringbuffer"
"github.com/corymonroe-coinbase/aeron-go/aeron/util/memmap"
"github.com/lirm/aeron-go/aeron/broadcast"
"github.com/lirm/aeron-go/aeron/counters"
"github.com/lirm/aeron-go/aeron/driver"
"github.com/lirm/aeron-go/aeron/logging"
rb "github.com/lirm/aeron-go/aeron/ringbuffer"
"github.com/lirm/aeron-go/aeron/util/memmap"
)

// NewPublicationHandler is the handler type for new publication notification from the media driver
Expand Down
2 changes: 1 addition & 1 deletion aeron/atomic/buffer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"sync/atomic"
"unsafe"

"github.com/corymonroe-coinbase/aeron-go/aeron/util"
"github.com/lirm/aeron-go/aeron/util"
)

// Buffer is the equivalent of AtomicBuffer used by Aeron Java and C++ implementations. It provides
Expand Down
3 changes: 2 additions & 1 deletion aeron/broadcast/copyreceiver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ package broadcast

import (
"fmt"
"github.com/corymonroe-coinbase/aeron-go/aeron/atomic"

"github.com/lirm/aeron-go/aeron/atomic"
)

type Handler func(int32, *atomic.Buffer, int32, int32)
Expand Down
6 changes: 3 additions & 3 deletions aeron/broadcast/receiver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ package broadcast
import (
"log"

"github.com/corymonroe-coinbase/aeron-go/aeron/atomic"
rb "github.com/corymonroe-coinbase/aeron-go/aeron/ringbuffer"
"github.com/corymonroe-coinbase/aeron-go/aeron/util"
"github.com/lirm/aeron-go/aeron/atomic"
rb "github.com/lirm/aeron-go/aeron/ringbuffer"
"github.com/lirm/aeron-go/aeron/util"
)

var BufferDescriptor = struct {
Expand Down
14 changes: 7 additions & 7 deletions aeron/clientconductor.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ import (
"sync"
"time"

"github.com/corymonroe-coinbase/aeron-go/aeron/atomic"
"github.com/corymonroe-coinbase/aeron-go/aeron/broadcast"
ctr "github.com/corymonroe-coinbase/aeron-go/aeron/counters"
"github.com/corymonroe-coinbase/aeron-go/aeron/driver"
"github.com/corymonroe-coinbase/aeron-go/aeron/idlestrategy"
"github.com/corymonroe-coinbase/aeron-go/aeron/logbuffer"
"github.com/corymonroe-coinbase/aeron-go/aeron/logging"
"github.com/lirm/aeron-go/aeron/atomic"
"github.com/lirm/aeron-go/aeron/broadcast"
ctr "github.com/lirm/aeron-go/aeron/counters"
"github.com/lirm/aeron-go/aeron/driver"
"github.com/lirm/aeron-go/aeron/idlestrategy"
"github.com/lirm/aeron-go/aeron/logbuffer"
"github.com/lirm/aeron-go/aeron/logging"
)

var RegistrationStatus = struct {
Expand Down
4 changes: 2 additions & 2 deletions aeron/command/flyweights.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ limitations under the License.
package command

import (
"github.com/corymonroe-coinbase/aeron-go/aeron/atomic"
"github.com/corymonroe-coinbase/aeron-go/aeron/flyweight"
"github.com/lirm/aeron-go/aeron/atomic"
"github.com/lirm/aeron-go/aeron/flyweight"
)

type CorrelatedMessage struct {
Expand Down
4 changes: 2 additions & 2 deletions aeron/context.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package aeron
import (
"time"

"github.com/corymonroe-coinbase/aeron-go/aeron/counters"
"github.com/corymonroe-coinbase/aeron-go/aeron/idlestrategy"
"github.com/lirm/aeron-go/aeron/counters"
"github.com/lirm/aeron-go/aeron/idlestrategy"
)

// Context configuration options are located here https://github.com/real-logic/Aeron/wiki/Configuration-Options#aeron-client-options
Expand Down
10 changes: 5 additions & 5 deletions aeron/counters/counters.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ import (
"errors"
"fmt"

"github.com/corymonroe-coinbase/aeron-go/aeron/logging"
"github.com/lirm/aeron-go/aeron/logging"

"github.com/corymonroe-coinbase/aeron-go/aeron/atomic"
"github.com/corymonroe-coinbase/aeron-go/aeron/flyweight"
"github.com/corymonroe-coinbase/aeron-go/aeron/util"
"github.com/corymonroe-coinbase/aeron-go/aeron/util/memmap"
"github.com/lirm/aeron-go/aeron/atomic"
"github.com/lirm/aeron-go/aeron/flyweight"
"github.com/lirm/aeron-go/aeron/util"
"github.com/lirm/aeron-go/aeron/util/memmap"
)

var logger = logging.MustGetLogger("counters")
Expand Down
4 changes: 2 additions & 2 deletions aeron/counters/reader.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"fmt"
"unsafe"

"github.com/corymonroe-coinbase/aeron-go/aeron/atomic"
"github.com/corymonroe-coinbase/aeron-go/aeron/util"
"github.com/lirm/aeron-go/aeron/atomic"
"github.com/lirm/aeron-go/aeron/util"
)

const COUNTER_LENGTH = util.CacheLineLength * 2
Expand Down
4 changes: 2 additions & 2 deletions aeron/driver/flyweights.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ limitations under the License.
package driver

import (
"github.com/corymonroe-coinbase/aeron-go/aeron/atomic"
"github.com/corymonroe-coinbase/aeron-go/aeron/flyweight"
"github.com/lirm/aeron-go/aeron/atomic"
"github.com/lirm/aeron-go/aeron/flyweight"
)

/**
Expand Down
8 changes: 4 additions & 4 deletions aeron/driver/listeneradapter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ limitations under the License.
package driver

import (
"github.com/corymonroe-coinbase/aeron-go/aeron/logging"
"github.com/lirm/aeron-go/aeron/logging"

"github.com/corymonroe-coinbase/aeron-go/aeron/atomic"
"github.com/corymonroe-coinbase/aeron-go/aeron/broadcast"
"github.com/corymonroe-coinbase/aeron-go/aeron/command"
"github.com/lirm/aeron-go/aeron/atomic"
"github.com/lirm/aeron-go/aeron/broadcast"
"github.com/lirm/aeron-go/aeron/command"
)

var logger = logging.MustGetLogger("driver")
Expand Down
6 changes: 3 additions & 3 deletions aeron/driver/proxy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ limitations under the License.
package driver

import (
"github.com/corymonroe-coinbase/aeron-go/aeron/atomic"
"github.com/corymonroe-coinbase/aeron-go/aeron/command"
rb "github.com/corymonroe-coinbase/aeron-go/aeron/ringbuffer"
"github.com/lirm/aeron-go/aeron/atomic"
"github.com/lirm/aeron-go/aeron/command"
rb "github.com/lirm/aeron-go/aeron/ringbuffer"
)

// Proxy is a media driver proxy class that is used to send commands
Expand Down
5 changes: 3 additions & 2 deletions aeron/flyweight/fields.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@ limitations under the License.
package flyweight

import (
"github.com/corymonroe-coinbase/aeron-go/aeron/atomic"
"github.com/corymonroe-coinbase/aeron-go/aeron/util"
syncatomic "sync/atomic"
"unsafe"

"github.com/lirm/aeron-go/aeron/atomic"
"github.com/lirm/aeron-go/aeron/util"
)

// Field is the interface for a field in a flyweight wrapper. It expects a preallocated buffer and offset into it, as
Expand Down
3 changes: 2 additions & 1 deletion aeron/flyweight/flightweight_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ limitations under the License.
package flyweight

import (
"github.com/corymonroe-coinbase/aeron-go/aeron/atomic"
"testing"

"github.com/lirm/aeron-go/aeron/atomic"
)

type StringFly struct {
Expand Down
2 changes: 1 addition & 1 deletion aeron/flyweight/flyweight.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ limitations under the License.

package flyweight

import "github.com/corymonroe-coinbase/aeron-go/aeron/atomic"
import "github.com/lirm/aeron-go/aeron/atomic"

type Flyweight interface {
Wrap(*atomic.Buffer, int) Flyweight
Expand Down
6 changes: 3 additions & 3 deletions aeron/fragmentassembler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ package aeron
import (
"bytes"

"github.com/corymonroe-coinbase/aeron-go/aeron/atomic"
"github.com/corymonroe-coinbase/aeron-go/aeron/logbuffer"
"github.com/corymonroe-coinbase/aeron-go/aeron/logbuffer/term"
"github.com/lirm/aeron-go/aeron/atomic"
"github.com/lirm/aeron-go/aeron/logbuffer"
"github.com/lirm/aeron-go/aeron/logbuffer/term"
)

const (
Expand Down
8 changes: 4 additions & 4 deletions aeron/image.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ limitations under the License.
package aeron

import (
"github.com/corymonroe-coinbase/aeron-go/aeron/atomic"
"github.com/corymonroe-coinbase/aeron-go/aeron/logbuffer"
"github.com/corymonroe-coinbase/aeron-go/aeron/logbuffer/term"
"github.com/corymonroe-coinbase/aeron-go/aeron/util"
"github.com/lirm/aeron-go/aeron/atomic"
"github.com/lirm/aeron-go/aeron/logbuffer"
"github.com/lirm/aeron-go/aeron/logbuffer/term"
"github.com/lirm/aeron-go/aeron/util"
)

type ControlledPollFragmentHandler func(buffer *atomic.Buffer, offset int32, length int32, header *logbuffer.Header)
Expand Down
2 changes: 1 addition & 1 deletion aeron/logbuffer/FrameDescriptor.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package logbuffer

import (
"github.com/corymonroe-coinbase/aeron-go/aeron/atomic"
"github.com/lirm/aeron-go/aeron/atomic"
)

const (
Expand Down
3 changes: 2 additions & 1 deletion aeron/logbuffer/claim.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ limitations under the License.
package logbuffer

import (
"github.com/corymonroe-coinbase/aeron-go/aeron/atomic"
"unsafe"

"github.com/lirm/aeron-go/aeron/atomic"
)

type Claim struct {
Expand Down
7 changes: 4 additions & 3 deletions aeron/logbuffer/descriptor.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@ package logbuffer

import (
"fmt"
"github.com/corymonroe-coinbase/aeron-go/aeron/atomic"
"github.com/corymonroe-coinbase/aeron-go/aeron/flyweight"
"github.com/corymonroe-coinbase/aeron-go/aeron/util"

"github.com/lirm/aeron-go/aeron/atomic"
"github.com/lirm/aeron-go/aeron/flyweight"
"github.com/lirm/aeron-go/aeron/util"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions aeron/logbuffer/header.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package logbuffer
import (
"unsafe"

"github.com/corymonroe-coinbase/aeron-go/aeron/atomic"
"github.com/corymonroe-coinbase/aeron-go/aeron/util"
"github.com/lirm/aeron-go/aeron/atomic"
"github.com/lirm/aeron-go/aeron/util"
)

type Header struct {
Expand Down
7 changes: 4 additions & 3 deletions aeron/logbuffer/logbuffers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@ limitations under the License.
package logbuffer

import (
"github.com/corymonroe-coinbase/aeron-go/aeron/atomic"
"github.com/corymonroe-coinbase/aeron-go/aeron/logging"
"github.com/corymonroe-coinbase/aeron-go/aeron/util/memmap"
"unsafe"

"github.com/lirm/aeron-go/aeron/atomic"
"github.com/lirm/aeron-go/aeron/logging"
"github.com/lirm/aeron-go/aeron/util/memmap"
)

var logger = logging.MustGetLogger("logbuffers")
Expand Down
9 changes: 5 additions & 4 deletions aeron/logbuffer/logbuffers_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@ package logbuffer

import (
"fmt"
"github.com/corymonroe-coinbase/aeron-go/aeron/atomic"
"github.com/corymonroe-coinbase/aeron-go/aeron/logging"
"github.com/corymonroe-coinbase/aeron-go/aeron/util"
"github.com/corymonroe-coinbase/aeron-go/aeron/util/memmap"
"testing"
"unsafe"

"github.com/lirm/aeron-go/aeron/atomic"
"github.com/lirm/aeron-go/aeron/logging"
"github.com/lirm/aeron-go/aeron/util"
"github.com/lirm/aeron-go/aeron/util/memmap"
)

func prepareFile(t *testing.T) *LogBuffers {
Expand Down
8 changes: 4 additions & 4 deletions aeron/logbuffer/term/appender.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ limitations under the License.
package term

import (
"github.com/corymonroe-coinbase/aeron-go/aeron/atomic"
"github.com/corymonroe-coinbase/aeron-go/aeron/flyweight"
"github.com/corymonroe-coinbase/aeron-go/aeron/logbuffer"
"github.com/corymonroe-coinbase/aeron-go/aeron/util"
"github.com/lirm/aeron-go/aeron/atomic"
"github.com/lirm/aeron-go/aeron/flyweight"
"github.com/lirm/aeron-go/aeron/logbuffer"
"github.com/lirm/aeron-go/aeron/util"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions aeron/logbuffer/term/reader.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ limitations under the License.
package term

import (
"github.com/corymonroe-coinbase/aeron-go/aeron/atomic"
"github.com/corymonroe-coinbase/aeron-go/aeron/logbuffer"
"github.com/corymonroe-coinbase/aeron-go/aeron/util"
"github.com/lirm/aeron-go/aeron/atomic"
"github.com/lirm/aeron-go/aeron/logbuffer"
"github.com/lirm/aeron-go/aeron/util"
)

// FragmentHandler is the main callback interface for received data
Expand Down
4 changes: 2 additions & 2 deletions aeron/position.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ limitations under the License.
package aeron

import (
"github.com/corymonroe-coinbase/aeron-go/aeron/atomic"
"github.com/corymonroe-coinbase/aeron-go/aeron/util"
"github.com/lirm/aeron-go/aeron/atomic"
"github.com/lirm/aeron-go/aeron/util"
)

// Position is a wrapper for a buffer location of a position counter
Expand Down
10 changes: 5 additions & 5 deletions aeron/publication.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ package aeron
import (
"fmt"

"github.com/corymonroe-coinbase/aeron-go/aeron/atomic"
"github.com/corymonroe-coinbase/aeron-go/aeron/logbuffer"
"github.com/corymonroe-coinbase/aeron-go/aeron/logbuffer/term"
"github.com/corymonroe-coinbase/aeron-go/aeron/logging"
"github.com/corymonroe-coinbase/aeron-go/aeron/util"
"github.com/lirm/aeron-go/aeron/atomic"
"github.com/lirm/aeron-go/aeron/logbuffer"
"github.com/lirm/aeron-go/aeron/logbuffer/term"
"github.com/lirm/aeron-go/aeron/logging"
"github.com/lirm/aeron-go/aeron/util"
)

const (
Expand Down
17 changes: 9 additions & 8 deletions aeron/publication_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,19 @@ limitations under the License.
package aeron

import (
"github.com/corymonroe-coinbase/aeron-go/aeron/atomic"
"github.com/corymonroe-coinbase/aeron-go/aeron/counters"
"github.com/corymonroe-coinbase/aeron-go/aeron/driver"
"github.com/corymonroe-coinbase/aeron-go/aeron/logbuffer"
"github.com/corymonroe-coinbase/aeron-go/aeron/logging"
"github.com/corymonroe-coinbase/aeron-go/aeron/ringbuffer"
"github.com/corymonroe-coinbase/aeron-go/aeron/util"
"github.com/corymonroe-coinbase/aeron-go/aeron/util/memmap"
"os"
"testing"
"time"
"unsafe"

"github.com/lirm/aeron-go/aeron/atomic"
"github.com/lirm/aeron-go/aeron/counters"
"github.com/lirm/aeron-go/aeron/driver"
"github.com/lirm/aeron-go/aeron/logbuffer"
"github.com/lirm/aeron-go/aeron/logging"
"github.com/lirm/aeron-go/aeron/ringbuffer"
"github.com/lirm/aeron-go/aeron/util"
"github.com/lirm/aeron-go/aeron/util/memmap"
)

func prepareFile(t *testing.T) (string, *logbuffer.LogBuffers) {
Expand Down
5 changes: 3 additions & 2 deletions aeron/ringbuffer/manytoone.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ package rb

import (
"fmt"
"github.com/corymonroe-coinbase/aeron-go/aeron/atomic"
"github.com/corymonroe-coinbase/aeron-go/aeron/util"

"github.com/lirm/aeron-go/aeron/atomic"
"github.com/lirm/aeron-go/aeron/util"
)

const insufficientCapacity int32 = -2
Expand Down
Loading

0 comments on commit 09fd749

Please sign in to comment.