Repository: incubator-mynewt-newt Updated Branches: refs/heads/1_0_0_b1_dev 0ce87a14c -> 264add5ae
newt - revendor dependencies. Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/commit/6da8e194 Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/tree/6da8e194 Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/diff/6da8e194 Branch: refs/heads/1_0_0_b1_dev Commit: 6da8e194d4304284bee35c70c0f6a0b54b74c611 Parents: 0ce87a1 Author: Christopher Collins <[email protected]> Authored: Tue Nov 22 11:15:01 2016 -0800 Committer: Christopher Collins <[email protected]> Committed: Tue Nov 22 11:17:09 2016 -0800 ---------------------------------------------------------------------- newt/Godeps/Godeps.json | 26 +++++++-------- .../github.com/Sirupsen/logrus/.travis.yml | 9 +++--- .../vendor/github.com/Sirupsen/logrus/README.md | 5 +++ .../Sirupsen/logrus/json_formatter.go | 34 ++++++++++++++++++-- .../Sirupsen/logrus/text_formatter.go | 11 ++++--- .../mitchellh/mapstructure/mapstructure.go | 8 ----- newt/vendor/github.com/spf13/cast/caste.go | 1 + newt/vendor/github.com/spf13/cobra/command.go | 22 +++++++++---- newt/vendor/github.com/spf13/pflag/.travis.yml | 3 +- newt/vendor/github.com/spf13/pflag/flag.go | 4 +-- .../golang.org/x/sys/unix/syscall_linux.go | 3 +- .../golang.org/x/sys/unix/zsyscall_linux_386.go | 15 +++++++-- .../x/sys/unix/zsyscall_linux_amd64.go | 15 +++++++-- .../golang.org/x/sys/unix/zsyscall_linux_arm.go | 15 +++++++-- .../x/sys/unix/zsyscall_linux_arm64.go | 15 +++++++-- .../x/sys/unix/zsyscall_linux_mips64.go | 15 +++++++-- .../x/sys/unix/zsyscall_linux_mips64le.go | 15 +++++++-- .../x/sys/unix/zsyscall_linux_ppc64.go | 15 +++++++-- .../x/sys/unix/zsyscall_linux_ppc64le.go | 15 +++++++-- .../x/sys/unix/zsyscall_linux_s390x.go | 21 +++++++++--- .../x/sys/unix/zsyscall_linux_sparc64.go | 21 +++++++++--- .../golang.org/x/sys/unix/ztypes_linux_arm.go | 11 ++++++- 22 files changed, 228 insertions(+), 71 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/6da8e194/newt/Godeps/Godeps.json ---------------------------------------------------------------------- diff --git a/newt/Godeps/Godeps.json b/newt/Godeps/Godeps.json index e870c47..32f885b 100644 --- a/newt/Godeps/Godeps.json +++ b/newt/Godeps/Godeps.json @@ -5,8 +5,8 @@ "Deps": [ { "ImportPath": "github.com/Sirupsen/logrus", - "Comment": "v0.10.0-38-g3ec0642", - "Rev": "3ec0642a7fb6488f65b06f9040adc67e3990296a" + "Comment": "v0.11.0-10-ga437dfd", + "Rev": "a437dfd2463eaedbec3dfe443e477d3b0a810b3f" }, { "ImportPath": "github.com/inconshreveable/mousetrap", @@ -23,15 +23,15 @@ }, { "ImportPath": "github.com/mitchellh/mapstructure", - "Rev": "a6ef2f080c66d0a2e94e97cf74f80f772855da63" + "Rev": "f3009df150dadf309fdee4a54ed65c124afad715" }, { "ImportPath": "github.com/spf13/cast", - "Rev": "2580bc98dc0e62908119e4737030cc2fdfc45e4c" + "Rev": "24b6558033ffe202bf42f0f3b870dcc798dd2ba8" }, { "ImportPath": "github.com/spf13/cobra", - "Rev": "ec2fe7859914a5106dcab4e7901633d959bfc2f4" + "Rev": "9495bc009a56819bdb0ddbc1a373e29c140bc674" }, { "ImportPath": "github.com/spf13/jwalterweatherman", @@ -39,11 +39,11 @@ }, { "ImportPath": "github.com/spf13/pflag", - "Rev": "bf8481a6aebc13a8aab52e699ffe2e79771f5a3f" + "Rev": "5ccb023bc27df288a957c5e994cd44fd19619465" }, { "ImportPath": "golang.org/x/sys/unix", - "Rev": "9bb9f0998d48b31547d975974935ae9b48c7a03c" + "Rev": "b699b7032584f0953262cb2788a0ca19bb494703" }, { "ImportPath": "gopkg.in/fsnotify.v1", @@ -52,18 +52,18 @@ }, { "ImportPath": "mynewt.apache.org/newt/util", - "Comment": "pre_sterly_refactor-77-gff4ef02", - "Rev": "ff4ef02818cd4fe0387f7314f3ba6a33cc247d5f" + "Comment": "pre_sterly_refactor-136-gb93ff7f", + "Rev": "b93ff7f6f8715f92d37ce68c66978f2b9bf20692" }, { "ImportPath": "mynewt.apache.org/newt/viper", - "Comment": "pre_sterly_refactor-77-gff4ef02", - "Rev": "ff4ef02818cd4fe0387f7314f3ba6a33cc247d5f" + "Comment": "pre_sterly_refactor-136-gb93ff7f", + "Rev": "b93ff7f6f8715f92d37ce68c66978f2b9bf20692" }, { "ImportPath": "mynewt.apache.org/newt/yaml", - "Comment": "pre_sterly_refactor-77-gff4ef02", - "Rev": "ff4ef02818cd4fe0387f7314f3ba6a33cc247d5f" + "Comment": "pre_sterly_refactor-136-gb93ff7f", + "Rev": "b93ff7f6f8715f92d37ce68c66978f2b9bf20692" } ] } http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/6da8e194/newt/vendor/github.com/Sirupsen/logrus/.travis.yml ---------------------------------------------------------------------- diff --git a/newt/vendor/github.com/Sirupsen/logrus/.travis.yml b/newt/vendor/github.com/Sirupsen/logrus/.travis.yml index dee4eb2..ec7dd78 100644 --- a/newt/vendor/github.com/Sirupsen/logrus/.travis.yml +++ b/newt/vendor/github.com/Sirupsen/logrus/.travis.yml @@ -1,10 +1,9 @@ language: go go: - - 1.3 - - 1.4 - - 1.5 - 1.6 + - 1.7 - tip install: - - go get -t ./... -script: GOMAXPROCS=4 GORACE="halt_on_error=1" go test -race -v ./... + - go get -t $(go list ./... | grep -v /examples/) +script: + - GOMAXPROCS=4 GORACE="halt_on_error=1" go test -race -v $(go list ./... | grep -v /examples/) http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/6da8e194/newt/vendor/github.com/Sirupsen/logrus/README.md ---------------------------------------------------------------------- diff --git a/newt/vendor/github.com/Sirupsen/logrus/README.md b/newt/vendor/github.com/Sirupsen/logrus/README.md index ab48929..f9cfb0a 100644 --- a/newt/vendor/github.com/Sirupsen/logrus/README.md +++ b/newt/vendor/github.com/Sirupsen/logrus/README.md @@ -228,8 +228,12 @@ Note: Syslog hook also support connecting to local syslog (Ex. "/dev/log" or "/v | [Typetalk](https://github.com/dragon3/logrus-typetalk-hook) | Hook for logging to [Typetalk](https://www.typetalk.in/) | | [ElasticSearch](https://github.com/sohlich/elogrus) | Hook for logging to ElasticSearch| | [Sumorus](https://github.com/doublefree/sumorus) | Hook for logging to [SumoLogic](https://www.sumologic.com/)| +| [Scribe](https://github.com/sagar8192/logrus-scribe-hook) | Hook for logging to [Scribe](https://github.com/facebookarchive/scribe)| | [Logstash](https://github.com/bshuster-repo/logrus-logstash-hook) | Hook for logging to [Logstash](https://www.elastic.co/products/logstash) | +| [logz.io](https://github.com/ripcurld00d/logrus-logzio-hook) | Hook for logging to [logz.io](https://logz.io), a Log as a Service using Logstash | | [Logmatic.io](https://github.com/logmatic/logmatic-go) | Hook for logging to [Logmatic.io](http://logmatic.io/) | +| [Pushover](https://github.com/toorop/logrus_pushover) | Send error via [Pushover](https://pushover.net) | +| [PostgreSQL](https://github.com/gemnasium/logrus-postgresql-hook) | Send logs to [PostgreSQL](http://postgresql.org) | #### Level logging @@ -367,6 +371,7 @@ entries. It should not be a feature of the application-level logger. | Tool | Description | | ---- | ----------- | |[Logrus Mate](https://github.com/gogap/logrus_mate)|Logrus mate is a tool for Logrus to manage loggers, you can initial logger's level, hook and formatter by config file, the logger will generated with different config at different environment.| +|[Logrus Viper Helper](https://github.com/heirko/go-contrib/tree/master/logrusHelper)|An Helper arround Logrus to wrap with spf13/Viper to load configuration with fangs! And to simplify Logrus configuration use some behavior of [Logrus Mate](https://github.com/gogap/logrus_mate). [sample](https://github.com/heirko/iris-contrib/blob/master/middleware/logrus-logger/example) | #### Testing http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/6da8e194/newt/vendor/github.com/Sirupsen/logrus/json_formatter.go ---------------------------------------------------------------------- diff --git a/newt/vendor/github.com/Sirupsen/logrus/json_formatter.go b/newt/vendor/github.com/Sirupsen/logrus/json_formatter.go index 2ad6dc5..f3729bf 100644 --- a/newt/vendor/github.com/Sirupsen/logrus/json_formatter.go +++ b/newt/vendor/github.com/Sirupsen/logrus/json_formatter.go @@ -5,9 +5,37 @@ import ( "fmt" ) +type fieldKey string +type FieldMap map[fieldKey]string + +const ( + FieldKeyMsg = "msg" + FieldKeyLevel = "level" + FieldKeyTime = "time" +) + +func (f FieldMap) resolve(key fieldKey) string { + if k, ok := f[key]; ok { + return k + } + + return string(key) +} + type JSONFormatter struct { // TimestampFormat sets the format used for marshaling timestamps. TimestampFormat string + + // FieldMap allows users to customize the names of keys for various fields. + // As an example: + // formatter := &JSONFormatter{ + // FieldMap: FieldMap{ + // FieldKeyTime: "@timestamp", + // FieldKeyLevel: "@level", + // FieldKeyLevel: "@message", + // }, + // } + FieldMap FieldMap } func (f *JSONFormatter) Format(entry *Entry) ([]byte, error) { @@ -29,9 +57,9 @@ func (f *JSONFormatter) Format(entry *Entry) ([]byte, error) { timestampFormat = DefaultTimestampFormat } - data["time"] = entry.Time.Format(timestampFormat) - data["msg"] = entry.Message - data["level"] = entry.Level.String() + data[f.FieldMap.resolve(FieldKeyTime)] = entry.Time.Format(timestampFormat) + data[f.FieldMap.resolve(FieldKeyMsg)] = entry.Message + data[f.FieldMap.resolve(FieldKeyLevel)] = entry.Level.String() serialized, err := json.Marshal(data) if err != nil { http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/6da8e194/newt/vendor/github.com/Sirupsen/logrus/text_formatter.go ---------------------------------------------------------------------- diff --git a/newt/vendor/github.com/Sirupsen/logrus/text_formatter.go b/newt/vendor/github.com/Sirupsen/logrus/text_formatter.go index cce61f2..9114b3c 100644 --- a/newt/vendor/github.com/Sirupsen/logrus/text_formatter.go +++ b/newt/vendor/github.com/Sirupsen/logrus/text_formatter.go @@ -122,7 +122,8 @@ func (f *TextFormatter) printColored(b *bytes.Buffer, entry *Entry, keys []strin } for _, k := range keys { v := entry.Data[k] - fmt.Fprintf(b, " \x1b[%dm%s\x1b[0m=%+v", levelColor, k, v) + fmt.Fprintf(b, " \x1b[%dm%s\x1b[0m=", levelColor, k) + f.appendValue(b, v) } } @@ -142,7 +143,11 @@ func (f *TextFormatter) appendKeyValue(b *bytes.Buffer, key string, value interf b.WriteString(key) b.WriteByte('=') + f.appendValue(b, value) + b.WriteByte(' ') +} +func (f *TextFormatter) appendValue(b *bytes.Buffer, value interface{}) { switch value := value.(type) { case string: if !needsQuoting(value) { @@ -155,11 +160,9 @@ func (f *TextFormatter) appendKeyValue(b *bytes.Buffer, key string, value interf if !needsQuoting(errmsg) { b.WriteString(errmsg) } else { - fmt.Fprintf(b, "%q", value) + fmt.Fprintf(b, "%q", errmsg) } default: fmt.Fprint(b, value) } - - b.WriteByte(' ') } http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/6da8e194/newt/vendor/github.com/mitchellh/mapstructure/mapstructure.go ---------------------------------------------------------------------- diff --git a/newt/vendor/github.com/mitchellh/mapstructure/mapstructure.go b/newt/vendor/github.com/mitchellh/mapstructure/mapstructure.go index d1cb607..b0ab89b 100644 --- a/newt/vendor/github.com/mitchellh/mapstructure/mapstructure.go +++ b/newt/vendor/github.com/mitchellh/mapstructure/mapstructure.go @@ -651,14 +651,6 @@ func (d *Decoder) decodeStruct(name string, data interface{}, val reflect.Value) fieldType := structType.Field(i) fieldKind := fieldType.Type.Kind() - if fieldType.Anonymous { - if fieldKind != reflect.Struct { - errors = appendErrors(errors, - fmt.Errorf("%s: unsupported type: %s", fieldType.Name, fieldKind)) - continue - } - } - // If "squash" is specified in the tag, we squash the field down. squash := false tagParts := strings.Split(fieldType.Tag.Get(d.config.TagName), ",") http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/6da8e194/newt/vendor/github.com/spf13/cast/caste.go ---------------------------------------------------------------------- diff --git a/newt/vendor/github.com/spf13/cast/caste.go b/newt/vendor/github.com/spf13/cast/caste.go index 23f59a1..23f0fe8 100644 --- a/newt/vendor/github.com/spf13/cast/caste.go +++ b/newt/vendor/github.com/spf13/cast/caste.go @@ -513,6 +513,7 @@ func StringToDate(s string) (time.Time, error) { "02 Jan 2006", "2006-01-02 15:04:05 -07:00", "2006-01-02 15:04:05 -0700", + "2006-01-02 15:04:05", }) } http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/6da8e194/newt/vendor/github.com/spf13/cobra/command.go ---------------------------------------------------------------------- diff --git a/newt/vendor/github.com/spf13/cobra/command.go b/newt/vendor/github.com/spf13/cobra/command.go index 8f6580a..4988931 100644 --- a/newt/vendor/github.com/spf13/cobra/command.go +++ b/newt/vendor/github.com/spf13/cobra/command.go @@ -231,12 +231,8 @@ func (c *Command) Usage() error { // HelpFunc returns either the function set by SetHelpFunc for this command // or a parent, or it returns a function with default help behavior. func (c *Command) HelpFunc() func(*Command, []string) { - cmd := c - for cmd != nil { - if cmd.helpFunc != nil { - return cmd.helpFunc - } - cmd = cmd.parent + if helpFunc := c.checkHelpFunc(); helpFunc != nil { + return helpFunc } return func(*Command, []string) { c.mergePersistentFlags() @@ -247,6 +243,20 @@ func (c *Command) HelpFunc() func(*Command, []string) { } } +// checkHelpFunc checks if there is helpFunc in ancestors of c. +func (c *Command) checkHelpFunc() func(*Command, []string) { + if c == nil { + return nil + } + if c.helpFunc != nil { + return c.helpFunc + } + if c.HasParent() { + return c.parent.checkHelpFunc() + } + return nil +} + // Help puts out the help for the command. // Used when a user calls help [command]. // Can be defined by user by overriding HelpFunc. http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/6da8e194/newt/vendor/github.com/spf13/pflag/.travis.yml ---------------------------------------------------------------------- diff --git a/newt/vendor/github.com/spf13/pflag/.travis.yml b/newt/vendor/github.com/spf13/pflag/.travis.yml index 0a7c136..707bdc3 100644 --- a/newt/vendor/github.com/spf13/pflag/.travis.yml +++ b/newt/vendor/github.com/spf13/pflag/.travis.yml @@ -3,9 +3,8 @@ sudo: false language: go go: - - 1.5.4 - 1.6.3 - - 1.7 + - 1.7.3 - tip matrix: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/6da8e194/newt/vendor/github.com/spf13/pflag/flag.go ---------------------------------------------------------------------- diff --git a/newt/vendor/github.com/spf13/pflag/flag.go b/newt/vendor/github.com/spf13/pflag/flag.go index 4258f45..fa81564 100644 --- a/newt/vendor/github.com/spf13/pflag/flag.go +++ b/newt/vendor/github.com/spf13/pflag/flag.go @@ -514,7 +514,7 @@ func (f *FlagSet) FlagUsages() string { if len(flag.NoOptDefVal) > 0 { switch flag.Value.Type() { case "string": - line += fmt.Sprintf("[=%q]", flag.NoOptDefVal) + line += fmt.Sprintf("[=\"%s\"]", flag.NoOptDefVal) case "bool": if flag.NoOptDefVal != "true" { line += fmt.Sprintf("[=%s]", flag.NoOptDefVal) @@ -534,7 +534,7 @@ func (f *FlagSet) FlagUsages() string { line += usage if !flag.defaultIsZeroValue() { if flag.Value.Type() == "string" { - line += fmt.Sprintf(" (default %q)", flag.DefValue) + line += fmt.Sprintf(" (default \"%s\")", flag.DefValue) } else { line += fmt.Sprintf(" (default %s)", flag.DefValue) } http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/6da8e194/newt/vendor/golang.org/x/sys/unix/syscall_linux.go ---------------------------------------------------------------------- diff --git a/newt/vendor/golang.org/x/sys/unix/syscall_linux.go b/newt/vendor/golang.org/x/sys/unix/syscall_linux.go index cfac4a4..74eae9b 100644 --- a/newt/vendor/golang.org/x/sys/unix/syscall_linux.go +++ b/newt/vendor/golang.org/x/sys/unix/syscall_linux.go @@ -899,6 +899,7 @@ func Getpgrp() (pid int) { //sysnb Getppid() (ppid int) //sys Getpriority(which int, who int) (prio int, err error) //sysnb Getrusage(who int, rusage *Rusage) (err error) +//sysnb Getsid(pid int) (sid int, err error) //sysnb Gettid() (tid int) //sys Getxattr(path string, attr string, dest []byte) (sz int, err error) //sys InotifyAddWatch(fd int, pathname string, mask uint32) (watchdesc int, err error) @@ -911,7 +912,7 @@ func Getpgrp() (pid int) { //sys Mknodat(dirfd int, path string, mode uint32, dev int) (err error) //sys Nanosleep(time *Timespec, leftover *Timespec) (err error) //sys PivotRoot(newroot string, putold string) (err error) = SYS_PIVOT_ROOT -//sysnb prlimit(pid int, resource int, old *Rlimit, newlimit *Rlimit) (err error) = SYS_PRLIMIT64 +//sysnb prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) = SYS_PRLIMIT64 //sys Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error) //sys read(fd int, p []byte) (n int, err error) //sys Removexattr(path string, attr string) (err error) http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/6da8e194/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go ---------------------------------------------------------------------- diff --git a/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go b/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go index 80f6a1b..fa92387 100644 --- a/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go +++ b/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go @@ -572,6 +572,17 @@ func Getrusage(who int, rusage *Rusage) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func Getsid(pid int) (sid int, err error) { + r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0) + sid = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func Gettid() (tid int) { r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0) tid = int(r0) @@ -762,8 +773,8 @@ func PivotRoot(newroot string, putold string) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func prlimit(pid int, resource int, old *Rlimit, newlimit *Rlimit) (err error) { - _, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(newlimit)), 0, 0) +func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) { + _, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0) if e1 != 0 { err = errnoErr(e1) } http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/6da8e194/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go ---------------------------------------------------------------------- diff --git a/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go b/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go index 078c8f0..b34d5c2 100644 --- a/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go +++ b/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go @@ -572,6 +572,17 @@ func Getrusage(who int, rusage *Rusage) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func Getsid(pid int) (sid int, err error) { + r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0) + sid = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func Gettid() (tid int) { r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0) tid = int(r0) @@ -762,8 +773,8 @@ func PivotRoot(newroot string, putold string) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func prlimit(pid int, resource int, old *Rlimit, newlimit *Rlimit) (err error) { - _, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(newlimit)), 0, 0) +func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) { + _, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0) if e1 != 0 { err = errnoErr(e1) } http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/6da8e194/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go ---------------------------------------------------------------------- diff --git a/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go b/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go index 76e5f7c..2e5cb39 100644 --- a/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go +++ b/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go @@ -572,6 +572,17 @@ func Getrusage(who int, rusage *Rusage) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func Getsid(pid int) (sid int, err error) { + r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0) + sid = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func Gettid() (tid int) { r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0) tid = int(r0) @@ -762,8 +773,8 @@ func PivotRoot(newroot string, putold string) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func prlimit(pid int, resource int, old *Rlimit, newlimit *Rlimit) (err error) { - _, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(newlimit)), 0, 0) +func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) { + _, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0) if e1 != 0 { err = errnoErr(e1) } http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/6da8e194/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go ---------------------------------------------------------------------- diff --git a/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go b/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go index 72b7947..0d584cc 100644 --- a/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go +++ b/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go @@ -572,6 +572,17 @@ func Getrusage(who int, rusage *Rusage) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func Getsid(pid int) (sid int, err error) { + r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0) + sid = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func Gettid() (tid int) { r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0) tid = int(r0) @@ -762,8 +773,8 @@ func PivotRoot(newroot string, putold string) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func prlimit(pid int, resource int, old *Rlimit, newlimit *Rlimit) (err error) { - _, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(newlimit)), 0, 0) +func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) { + _, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0) if e1 != 0 { err = errnoErr(e1) } http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/6da8e194/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go ---------------------------------------------------------------------- diff --git a/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go b/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go index ba55509..bf6f360 100644 --- a/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go +++ b/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go @@ -572,6 +572,17 @@ func Getrusage(who int, rusage *Rusage) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func Getsid(pid int) (sid int, err error) { + r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0) + sid = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func Gettid() (tid int) { r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0) tid = int(r0) @@ -762,8 +773,8 @@ func PivotRoot(newroot string, putold string) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func prlimit(pid int, resource int, old *Rlimit, newlimit *Rlimit) (err error) { - _, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(newlimit)), 0, 0) +func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) { + _, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0) if e1 != 0 { err = errnoErr(e1) } http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/6da8e194/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go ---------------------------------------------------------------------- diff --git a/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go b/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go index 2b1cc84..8c86bd7 100644 --- a/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go +++ b/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go @@ -572,6 +572,17 @@ func Getrusage(who int, rusage *Rusage) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func Getsid(pid int) (sid int, err error) { + r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0) + sid = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func Gettid() (tid int) { r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0) tid = int(r0) @@ -762,8 +773,8 @@ func PivotRoot(newroot string, putold string) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func prlimit(pid int, resource int, old *Rlimit, newlimit *Rlimit) (err error) { - _, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(newlimit)), 0, 0) +func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) { + _, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0) if e1 != 0 { err = errnoErr(e1) } http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/6da8e194/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go ---------------------------------------------------------------------- diff --git a/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go b/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go index 25f39db..f5d488b 100644 --- a/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go +++ b/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go @@ -572,6 +572,17 @@ func Getrusage(who int, rusage *Rusage) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func Getsid(pid int) (sid int, err error) { + r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0) + sid = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func Gettid() (tid int) { r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0) tid = int(r0) @@ -762,8 +773,8 @@ func PivotRoot(newroot string, putold string) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func prlimit(pid int, resource int, old *Rlimit, newlimit *Rlimit) (err error) { - _, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(newlimit)), 0, 0) +func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) { + _, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0) if e1 != 0 { err = errnoErr(e1) } http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/6da8e194/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go ---------------------------------------------------------------------- diff --git a/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go b/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go index 70702b5..5183711 100644 --- a/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go +++ b/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go @@ -572,6 +572,17 @@ func Getrusage(who int, rusage *Rusage) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func Getsid(pid int) (sid int, err error) { + r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0) + sid = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func Gettid() (tid int) { r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0) tid = int(r0) @@ -762,8 +773,8 @@ func PivotRoot(newroot string, putold string) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func prlimit(pid int, resource int, old *Rlimit, newlimit *Rlimit) (err error) { - _, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(newlimit)), 0, 0) +func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) { + _, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0) if e1 != 0 { err = errnoErr(e1) } http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/6da8e194/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go ---------------------------------------------------------------------- diff --git a/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go b/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go index dbaa53b..4c7ed08 100644 --- a/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go +++ b/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go @@ -64,7 +64,7 @@ func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func readlinkat(dirfd int, path string, buf []byte) (n int, err error) { +func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) { var _p0 *byte _p0, err = BytePtrFromString(path) if err != nil { @@ -87,7 +87,7 @@ func readlinkat(dirfd int, path string, buf []byte) (n int, err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func symlinkat(oldpath string, newdirfd int, newpath string) (err error) { +func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) { var _p0 *byte _p0, err = BytePtrFromString(oldpath) if err != nil { @@ -109,7 +109,7 @@ func symlinkat(oldpath string, newdirfd int, newpath string) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func unlinkat(dirfd int, path string, flags int) (err error) { +func Unlinkat(dirfd int, path string, flags int) (err error) { var _p0 *byte _p0, err = BytePtrFromString(path) if err != nil { @@ -572,6 +572,17 @@ func Getrusage(who int, rusage *Rusage) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func Getsid(pid int) (sid int, err error) { + r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0) + sid = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func Gettid() (tid int) { r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0) tid = int(r0) @@ -762,8 +773,8 @@ func PivotRoot(newroot string, putold string) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func prlimit(pid int, resource int, old *Rlimit, newlimit *Rlimit) (err error) { - _, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(newlimit)), 0, 0) +func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) { + _, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0) if e1 != 0 { err = errnoErr(e1) } http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/6da8e194/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_sparc64.go ---------------------------------------------------------------------- diff --git a/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_sparc64.go b/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_sparc64.go index 08ee5d0..beb83e4 100644 --- a/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_sparc64.go +++ b/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_sparc64.go @@ -64,7 +64,7 @@ func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int, // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func readlinkat(dirfd int, path string, buf []byte) (n int, err error) { +func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) { var _p0 *byte _p0, err = BytePtrFromString(path) if err != nil { @@ -87,7 +87,7 @@ func readlinkat(dirfd int, path string, buf []byte) (n int, err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func symlinkat(oldpath string, newdirfd int, newpath string) (err error) { +func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) { var _p0 *byte _p0, err = BytePtrFromString(oldpath) if err != nil { @@ -109,7 +109,7 @@ func symlinkat(oldpath string, newdirfd int, newpath string) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func unlinkat(dirfd int, path string, flags int) (err error) { +func Unlinkat(dirfd int, path string, flags int) (err error) { var _p0 *byte _p0, err = BytePtrFromString(path) if err != nil { @@ -572,6 +572,17 @@ func Getrusage(who int, rusage *Rusage) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT +func Getsid(pid int) (sid int, err error) { + r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0) + sid = int(r0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + func Gettid() (tid int) { r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0) tid = int(r0) @@ -762,8 +773,8 @@ func PivotRoot(newroot string, putold string) (err error) { // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -func prlimit(pid int, resource int, old *Rlimit, newlimit *Rlimit) (err error) { - _, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(newlimit)), 0, 0) +func prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) { + _, _, e1 := RawSyscall6(SYS_PRLIMIT64, uintptr(pid), uintptr(resource), uintptr(unsafe.Pointer(newlimit)), uintptr(unsafe.Pointer(old)), 0, 0) if e1 != 0 { err = errnoErr(e1) } http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/6da8e194/newt/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go ---------------------------------------------------------------------- diff --git a/newt/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go b/newt/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go index 817ac9c..35f11bd 100644 --- a/newt/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go +++ b/newt/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go @@ -1,6 +1,6 @@ // +build arm,linux // Created by cgo -godefs - DO NOT EDIT -// cgo -godefs types_linux.go +// cgo -godefs types_linux.go | go run mkpost.go package unix @@ -155,6 +155,15 @@ type Flock_t struct { Pad_cgo_1 [4]byte } +const ( + FADV_NORMAL = 0x0 + FADV_RANDOM = 0x1 + FADV_SEQUENTIAL = 0x2 + FADV_WILLNEED = 0x3 + FADV_DONTNEED = 0x4 + FADV_NOREUSE = 0x5 +) + type RawSockaddrInet4 struct { Family uint16 Port uint16
