Skip to content
This repository was archived by the owner on Jun 18, 2020. It is now read-only.

Cherrypick a fix for memory consumption #161

Open
muhamadazmy wants to merge 1 commit into
base: release-threefold-edge.nodes-0001
Choose a base branch
from
Open

Cherrypick a fix for memory consumption #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions apps/core0/bootstrap/bootstrap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import (

"github.com/op/go-logging"
"github.com/vishvananda/netlink"
"github.com/zero-os/0-core/apps/core0/bootstrap/network"
"github.com/zero-os/0-core/apps/core0/options"
"github.com/zero-os/0-core/apps/core0/screen"
"github.com/zero-os/0-core/base/pm"
"github.com/zero-os/0-core/base/settings"
"github.com/zero-os/0-core/base/utils"
"github.com/threefoldtech/0-core/apps/core0/bootstrap/network"
"github.com/threefoldtech/0-core/apps/core0/options"
"github.com/threefoldtech/0-core/apps/core0/screen"
"github.com/threefoldtech/0-core/base/pm"
"github.com/threefoldtech/0-core/base/settings"
"github.com/threefoldtech/0-core/base/utils"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion apps/core0/bootstrap/network/dhcp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"io/ioutil"
"os"

"github.com/zero-os/0-core/base/pm"
"github.com/threefoldtech/0-core/base/pm"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion apps/core0/bootstrap/network/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"github.com/op/go-logging"
"github.com/vishvananda/netlink"
"github.com/zero-os/0-core/base/utils"
"github.com/threefoldtech/0-core/base/utils"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion apps/core0/bootstrap/nft.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package bootstrap
import (
"io/ioutil"

"github.com/zero-os/0-core/base/nft"
"github.com/threefoldtech/0-core/base/nft"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions apps/core0/builtin/bridge.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"syscall"

"github.com/vishvananda/netlink"
"github.com/zero-os/0-core/base/nft"
"github.com/zero-os/0-core/base/pm"
"github.com/zero-os/0-core/base/utils"
"github.com/threefoldtech/0-core/base/nft"
"github.com/threefoldtech/0-core/base/pm"
"github.com/threefoldtech/0-core/base/utils"
)

type bridgeMgr struct {
Expand Down
2 changes: 1 addition & 1 deletion apps/core0/builtin/btrfs/btrfs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strconv"
"strings"

"github.com/zero-os/0-core/base/pm"
"github.com/threefoldtech/0-core/base/pm"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions apps/core0/builtin/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package builtin

import (
"github.com/zero-os/0-core/base/pm"
"github.com/zero-os/0-core/base/settings"
"github.com/threefoldtech/0-core/base/pm"
"github.com/threefoldtech/0-core/base/settings"
)

type configMgr struct{}
Expand Down
4 changes: 2 additions & 2 deletions apps/core0/builtin/disk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"strings"
"syscall"

"github.com/zero-os/0-core/base/pm"
"github.com/zero-os/0-core/base/utils"
"github.com/threefoldtech/0-core/base/pm"
"github.com/threefoldtech/0-core/base/utils"
"golang.org/x/sys/unix"
)

Expand Down
2 changes: 1 addition & 1 deletion apps/core0/builtin/dmi.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"strings"
"unicode"

"github.com/zero-os/0-core/base/pm"
"github.com/threefoldtech/0-core/base/pm"
)

//DMIType (allowed types 0 -> 42)
Expand Down
2 changes: 1 addition & 1 deletion apps/core0/builtin/logger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"

"github.com/op/go-logging"
"github.com/zero-os/0-core/base/pm"
"github.com/threefoldtech/0-core/base/pm"
"os"
"syscall"
)
Expand Down
4 changes: 2 additions & 2 deletions apps/core0/builtin/monitor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"github.com/shirou/gopsutil/net"
ps "github.com/shirou/gopsutil/process"
"github.com/vishvananda/netlink"
"github.com/zero-os/0-core/base/pm"
"github.com/zero-os/0-core/base/utils"
"github.com/threefoldtech/0-core/base/pm"
"github.com/threefoldtech/0-core/base/utils"
"io/ioutil"
"path"
"strconv"
Expand Down
4 changes: 2 additions & 2 deletions apps/core0/builtin/nft.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"net"
"sync"

"github.com/zero-os/0-core/base/nft"
"github.com/zero-os/0-core/base/pm"
"github.com/threefoldtech/0-core/base/nft"
"github.com/threefoldtech/0-core/base/pm"
)

type nftMgr struct {
Expand Down
2 changes: 1 addition & 1 deletion apps/core0/builtin/power.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package builtin
import (
"syscall"

"github.com/zero-os/0-core/base/pm"
"github.com/threefoldtech/0-core/base/pm"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion apps/core0/builtin/pprof.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package builtin

import (
"encoding/json"
"github.com/zero-os/0-core/base/pm"
"github.com/threefoldtech/0-core/base/pm"
"os"
"runtime"
"runtime/pprof"
Expand Down
2 changes: 1 addition & 1 deletion apps/core0/builtin/rtinfo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"sync"

"github.com/pborman/uuid"
"github.com/zero-os/0-core/base/pm"
"github.com/threefoldtech/0-core/base/pm"
)

const cmdbin = "rtinfo-client"
Expand Down
2 changes: 1 addition & 1 deletion apps/core0/builtin/web.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"net/http"
"os"

"github.com/zero-os/0-core/base/pm"
"github.com/threefoldtech/0-core/base/pm"
)

func init() {
Expand Down
6 changes: 3 additions & 3 deletions apps/core0/helper/filesystem/filesystem.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
"strings"
"sync"

"github.com/zero-os/0-core/base/pm"
"github.com/zero-os/0-core/base/pm/stream"
"github.com/zero-os/0-core/base/settings"
"github.com/threefoldtech/0-core/base/pm"
"github.com/threefoldtech/0-core/base/pm/stream"
"github.com/threefoldtech/0-core/base/settings"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion apps/core0/helper/filesystem/restic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package filesystem

import (
"fmt"
"github.com/zero-os/0-core/base/pm"
"github.com/threefoldtech/0-core/base/pm"
"net/url"
)

Expand Down
2 changes: 1 addition & 1 deletion apps/core0/helper/socat/socat.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strings"
"sync"

"github.com/zero-os/0-core/base/nft"
"github.com/threefoldtech/0-core/base/nft"

"github.com/op/go-logging"
)
Expand Down
6 changes: 3 additions & 3 deletions apps/core0/local.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package main
import (
"encoding/json"
"fmt"
"github.com/zero-os/0-core/base/pm"
"github.com/zero-os/0-core/base/utils"
"github.com/zero-os/0-core/apps/core0/subsys/containers"
"github.com/threefoldtech/0-core/base/pm"
"github.com/threefoldtech/0-core/base/utils"
"github.com/threefoldtech/0-core/apps/core0/subsys/containers"
"net"
"os"
"strconv"
Expand Down
8 changes: 4 additions & 4 deletions apps/core0/logger/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package logger

import (
"github.com/zero-os/0-core/base/pm"
"github.com/zero-os/0-core/base/pm/stream"
"github.com/zero-os/0-core/base/settings"
"github.com/zero-os/0-core/apps/core0/transport"
"github.com/threefoldtech/0-core/base/pm"
"github.com/threefoldtech/0-core/base/pm/stream"
"github.com/threefoldtech/0-core/base/settings"
"github.com/threefoldtech/0-core/apps/core0/transport"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions apps/core0/logger/ledis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"sync"

"github.com/pborman/uuid"
"github.com/zero-os/0-core/base/pm"
"github.com/zero-os/0-core/base/pm/stream"
"github.com/zero-os/0-core/apps/core0/transport"
"github.com/threefoldtech/0-core/base/pm"
"github.com/threefoldtech/0-core/base/pm/stream"
"github.com/threefoldtech/0-core/apps/core0/transport"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion apps/core0/logger/logger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package logger

import (
"github.com/op/go-logging"
"github.com/zero-os/0-core/base/pm/stream"
"github.com/threefoldtech/0-core/base/pm/stream"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions apps/core0/logger/streamer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"encoding/json"
"fmt"

"github.com/zero-os/0-core/base/pm/stream"
"github.com/zero-os/0-core/apps/core0/transport"
"github.com/threefoldtech/0-core/base/pm/stream"
"github.com/threefoldtech/0-core/apps/core0/transport"
)

const (
Expand Down
32 changes: 16 additions & 16 deletions apps/core0/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,26 @@ import (
"os"

"github.com/op/go-logging"
"github.com/zero-os/0-core/apps/core0/assets"
"github.com/zero-os/0-core/apps/core0/bootstrap"
"github.com/zero-os/0-core/apps/core0/logger"
"github.com/zero-os/0-core/apps/core0/options"
"github.com/zero-os/0-core/apps/core0/screen"
"github.com/zero-os/0-core/apps/core0/stats"
"github.com/zero-os/0-core/apps/core0/subsys/cgroups"
"github.com/zero-os/0-core/apps/core0/subsys/containers"
"github.com/zero-os/0-core/apps/core0/subsys/kvm"
"github.com/zero-os/0-core/base"
"github.com/zero-os/0-core/base/pm"
"github.com/zero-os/0-core/base/settings"
"github.com/threefoldtech/0-core/apps/core0/assets"
"github.com/threefoldtech/0-core/apps/core0/bootstrap"
"github.com/threefoldtech/0-core/apps/core0/logger"
"github.com/threefoldtech/0-core/apps/core0/options"
"github.com/threefoldtech/0-core/apps/core0/screen"
"github.com/threefoldtech/0-core/apps/core0/stats"
"github.com/threefoldtech/0-core/apps/core0/subsys/cgroups"
"github.com/threefoldtech/0-core/apps/core0/subsys/containers"
"github.com/threefoldtech/0-core/apps/core0/subsys/kvm"
core "github.com/threefoldtech/0-core/base"
"github.com/threefoldtech/0-core/base/pm"
"github.com/threefoldtech/0-core/base/settings"

"os/signal"
"syscall"

_ "github.com/zero-os/0-core/apps/core0/builtin"
_ "github.com/zero-os/0-core/apps/core0/builtin/btrfs"
"github.com/zero-os/0-core/apps/core0/transport"
_ "github.com/zero-os/0-core/base/builtin"
_ "github.com/threefoldtech/0-core/apps/core0/builtin"
_ "github.com/threefoldtech/0-core/apps/core0/builtin/btrfs"
"github.com/threefoldtech/0-core/apps/core0/transport"
_ "github.com/threefoldtech/0-core/base/builtin"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion apps/core0/options/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package options
import (
"flag"
"fmt"
"github.com/zero-os/0-core/base/utils"
"github.com/threefoldtech/0-core/base/utils"
"os"
)

Expand Down
4 changes: 2 additions & 2 deletions apps/core0/output.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"time"

"github.com/op/go-logging"
"github.com/zero-os/0-core/apps/core0/options"
"github.com/zero-os/0-core/base/pm"
"github.com/threefoldtech/0-core/apps/core0/options"
"github.com/threefoldtech/0-core/base/pm"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion apps/core0/screen/screen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"time"

"github.com/op/go-logging"
"github.com/zero-os/0-core/base/pm"
"github.com/threefoldtech/0-core/base/pm"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions apps/core0/stats/ledis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (

"github.com/op/go-logging"
"github.com/patrickmn/go-cache"
"github.com/zero-os/0-core/base/pm"
"github.com/zero-os/0-core/apps/core0/transport"
"github.com/threefoldtech/0-core/base/pm"
"github.com/threefoldtech/0-core/apps/core0/transport"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion apps/core0/stats/stats.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package stats

import (
"encoding/json"
"github.com/zero-os/0-core/base/pm"
"github.com/threefoldtech/0-core/base/pm"
"math"
"time"
)
Expand Down
2 changes: 1 addition & 1 deletion apps/core0/subsys/cgroups/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package cgroups
import (
"encoding/json"

"github.com/zero-os/0-core/base/pm"
"github.com/threefoldtech/0-core/base/pm"
)

type GroupArg struct {
Expand Down
2 changes: 1 addition & 1 deletion apps/core0/subsys/cgroups/cgroups.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"syscall"

logging "github.com/op/go-logging"
"github.com/zero-os/0-core/base/pm"
"github.com/threefoldtech/0-core/base/pm"
)

type mkg func(name string, subsys Subsystem) Group
Expand Down
4 changes: 2 additions & 2 deletions apps/core0/subsys/containers/backup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package containers
import (
"encoding/json"
"fmt"
"github.com/zero-os/0-core/base/pm"
"github.com/zero-os/0-core/apps/core0/helper/filesystem"
"github.com/threefoldtech/0-core/base/pm"
"github.com/threefoldtech/0-core/apps/core0/helper/filesystem"
"io/ioutil"
"net/url"
"os"
Expand Down
8 changes: 4 additions & 4 deletions apps/core0/subsys/containers/comm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"fmt"
"io"

"github.com/zero-os/0-core/apps/core0/logger"
"github.com/zero-os/0-core/apps/core0/stats"
"github.com/zero-os/0-core/base/pm"
"github.com/zero-os/0-core/base/pm/stream"
"github.com/threefoldtech/0-core/apps/core0/logger"
"github.com/threefoldtech/0-core/apps/core0/stats"
"github.com/threefoldtech/0-core/base/pm"
"github.com/threefoldtech/0-core/base/pm/stream"
)

const (
Expand Down
Loading