aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Lange <fjl@users.noreply.github.com>2018-11-08 20:26:29 +0800
committerPéter Szilágyi <peterke@gmail.com>2018-11-08 20:26:29 +0800
commit9313fa63f959f8a5c3609c187120711a484a4c57 (patch)
tree7c93f48e8e5e5235d55d34a0014c75c66d7f6eef
parentd0675e9d9cf847070c1e422faf15e66b6af74781 (diff)
downloaddexon-9313fa63f959f8a5c3609c187120711a484a4c57.tar.gz
dexon-9313fa63f959f8a5c3609c187120711a484a4c57.tar.zst
dexon-9313fa63f959f8a5c3609c187120711a484a4c57.zip
event/filter: delete unused package (#18063)
-rw-r--r--event/filter/filter.go95
-rw-r--r--event/filter/filter_test.go60
-rw-r--r--event/filter/generic_filter.go48
3 files changed, 0 insertions, 203 deletions
diff --git a/event/filter/filter.go b/event/filter/filter.go
deleted file mode 100644
index a6fe46d6a..000000000
--- a/event/filter/filter.go
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright 2014 The go-ethereum Authors
-// This file is part of the go-ethereum library.
-//
-// The go-ethereum library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// The go-ethereum library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
-
-// Package filter implements event filters.
-package filter
-
-import "reflect"
-
-type Filter interface {
- Compare(Filter) bool
- Trigger(data interface{})
-}
-
-type FilterEvent struct {
- filter Filter
- data interface{}
-}
-
-type Filters struct {
- id int
- watchers map[int]Filter
- ch chan FilterEvent
-
- quit chan struct{}
-}
-
-func New() *Filters {
- return &Filters{
- ch: make(chan FilterEvent),
- watchers: make(map[int]Filter),
- quit: make(chan struct{}),
- }
-}
-
-func (f *Filters) Start() {
- go f.loop()
-}
-
-func (f *Filters) Stop() {
- close(f.quit)
-}
-
-func (f *Filters) Notify(filter Filter, data interface{}) {
- f.ch <- FilterEvent{filter, data}
-}
-
-func (f *Filters) Install(watcher Filter) int {
- f.watchers[f.id] = watcher
- f.id++
-
- return f.id - 1
-}
-
-func (f *Filters) Uninstall(id int) {
- delete(f.watchers, id)
-}
-
-func (f *Filters) loop() {
-out:
- for {
- select {
- case <-f.quit:
- break out
- case event := <-f.ch:
- for _, watcher := range f.watchers {
- if reflect.TypeOf(watcher) == reflect.TypeOf(event.filter) {
- if watcher.Compare(event.filter) {
- watcher.Trigger(event.data)
- }
- }
- }
- }
- }
-}
-
-func (f *Filters) Match(a, b Filter) bool {
- return reflect.TypeOf(a) == reflect.TypeOf(b) && a.Compare(b)
-}
-
-func (f *Filters) Get(i int) Filter {
- return f.watchers[i]
-}
diff --git a/event/filter/filter_test.go b/event/filter/filter_test.go
deleted file mode 100644
index dcc911245..000000000
--- a/event/filter/filter_test.go
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2014 The go-ethereum Authors
-// This file is part of the go-ethereum library.
-//
-// The go-ethereum library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// The go-ethereum library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
-
-package filter
-
-import (
- "testing"
- "time"
-)
-
-// Simple test to check if baseline matching/mismatching filtering works.
-func TestFilters(t *testing.T) {
- fm := New()
- fm.Start()
-
- // Register two filters to catch posted data
- first := make(chan struct{})
- fm.Install(Generic{
- Str1: "hello",
- Fn: func(data interface{}) {
- first <- struct{}{}
- },
- })
- second := make(chan struct{})
- fm.Install(Generic{
- Str1: "hello1",
- Str2: "hello",
- Fn: func(data interface{}) {
- second <- struct{}{}
- },
- })
- // Post an event that should only match the first filter
- fm.Notify(Generic{Str1: "hello"}, true)
- fm.Stop()
-
- // Ensure only the mathcing filters fire
- select {
- case <-first:
- case <-time.After(100 * time.Millisecond):
- t.Error("matching filter timed out")
- }
- select {
- case <-second:
- t.Error("mismatching filter fired")
- case <-time.After(100 * time.Millisecond):
- }
-}
diff --git a/event/filter/generic_filter.go b/event/filter/generic_filter.go
deleted file mode 100644
index 467bf01be..000000000
--- a/event/filter/generic_filter.go
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2014 The go-ethereum Authors
-// This file is part of the go-ethereum library.
-//
-// The go-ethereum library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// The go-ethereum library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
-
-package filter
-
-type Generic struct {
- Str1, Str2, Str3 string
- Data map[string]struct{}
-
- Fn func(data interface{})
-}
-
-// self = registered, f = incoming
-func (self Generic) Compare(f Filter) bool {
- var strMatch = true
-
- filter := f.(Generic)
- if (len(self.Str1) > 0 && filter.Str1 != self.Str1) ||
- (len(self.Str2) > 0 && filter.Str2 != self.Str2) ||
- (len(self.Str3) > 0 && filter.Str3 != self.Str3) {
- strMatch = false
- }
-
- for k := range self.Data {
- if _, ok := filter.Data[k]; !ok {
- return false
- }
- }
-
- return strMatch
-}
-
-func (self Generic) Trigger(data interface{}) {
- self.Fn(data)
-}
6f3eb34b7fd52fe17d4b789fef058dfef877a3c5'>lang/icc/Makefile
+++ b/lang/icc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= icc
PORTVERSION= 6.0.159
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= lang linux devel
MASTER_SITES=
DISTNAME= l_cc_pu_6.0.159
@@ -26,7 +26,6 @@ ONLY_FOR_ARCHS= i386
USE_LINUX= yes
USE_REINPLACE= yes
NO_WRKSUBDIR= yes
-NO_BUILD= yes
NO_FILTER_SHLIBS= yes
MAN1= icc.1
@@ -72,26 +71,26 @@ post-patch:
# Correct some paths and patch some files
.for i in ia32/bin/icc ia32/bin/icc.cfg ia32/bin/iccvars.csh \
ia32/bin/iccvars.sh ia32/bin/icpc ia32/bin/icpc.cfg docs/csupport
- @${REINPLACE_CMD} -i "" -e 's@export -n IA32ROOT; unset IA32ROOT;@@g; s@-a "<INSTALLDIR>/compiler60/ia32/bin/icc" @@g; s@-a "<INSTALLDIR>/compiler60/ia32/bin/icpc" @@g; s@\<INSTALLDIR\>@${PREFIX}/intel@g; s@-tp p6@@; s@man -w@manpath -q@g; s:\<INSTALLTIMECOMBOPACKAGEID\>:${DISTNAME}:g' \
+ @${REINPLACE_CMD} -i "" -e 's:@@PREFIX@@:${PREFIX}:g; s@man -w@manpath -q@g; s:\<INSTALLTIMECOMBOPACKAGEID\>:${DISTNAME}:g' \
${WRKSRC}/opt/intel/compiler60/${i}
@${CHMOD} 755 ${WRKSRC}/opt/intel/compiler60/${i}
.endfor
# Remove unneeded files
-.for i in cwchar.orig yvals.h.orig algorithm bitset complex deque fstream \
- fstream.h functional hash_map hash_set iomanip iomanip.h ios iosfwd \
- iostream iostream.h istream iterator limits list locale map mathf.h \
+.for i in cfloat.orig cwchar.orig yvals.h.orig algorithm bitset complex deque \
+ fstream fstream.h functional hash_map hash_set iomanip iomanip.h ios \
+ iosfwd iostream iostream.h istream iterator limits list locale map \
memory numeric ostream queue set slist sstream stack stdexcept stl.h \
stream.h streambuf string strstream strstream.h utility valarray \
vector xcomplex xdebug xhash xiosbase xlocale xlocinfo xlocinfo.h \
xlocmes xlocmon xlocnum xloctime xmemory xstring xtree xutility ymath.h
@${RM} ${WRKSRC}/opt/intel/compiler60/ia32/include/${i}
.endfor
-.for i in crtxi.o crtxn.o icrt.link libcprts.so libcprts.so.1 libimf.a \
- libunwind.so libunwind.so.1
+.for i in libcprts.a libcprts.so libcprts.so.1 libunwind.so libunwind.so.1
@${RM} -rf ${WRKSRC}/opt/intel/compiler60/ia32/lib/${i}
.endfor
@${RM} ${WRKSRC}/opt/intel/compiler60/ia32/bin/uninstall \
- ${WRKSRC}/opt/intel/compiler60/ia32/bin/icc.orig
+ ${WRKSRC}/opt/intel/compiler60/ia32/bin/icc.orig \
+ ${WRKSRC}/opt/intel/compiler60/ia32/bin/icpc.orig
.if defined(NOPORTDOCS)
@${RM} -rf ${WRKSRC}/opt/intel/compiler60/docs
.endif
@@ -100,19 +99,21 @@ post-patch:
@${ECHO} -e "\n-Ulinux\n-U__linux__\n-U__linux\n\n-D__FreeBSD__=${ICCCFGVAL}\n-D__ELF__=1\n" >>${WRKSRC}/opt/intel/compiler60/ia32/bin/${i}
@${CHMOD} a-x,g-w ${WRKSRC}/opt/intel/compiler60/ia32/bin/${i}
.endfor
-# C++ hack for ipcp
+# C++ hack for icpc
@${ECHO} -e "\n-I${PREFIX}/include/stlport\n-Qoption,ld,-CPLUSPLUS\n" >>${WRKSRC}/opt/intel/compiler60/ia32/bin/icpc.cfg
@cd ${WRKSRC}/opt/intel/compiler60/ia32/bin/ && ${LN} -s icc.cfg iccbin.cfg && ${LN} -s icpc.cfg icpcbin.cfg
# \n-Qlocation,ld,/usr/bin\n\n-sox-\n
-# Fix (some) unresolved references in libcprts, libcxa and libunwind
- @cd ${WRKSRC} && ${CC} -c ${FILESDIR}/*.c && \
+
+do-build:
+# Fix unresolved references in libcxa.a, libimf.a and libunwind.a
+ @cd ${WRKSRC} && ${CC} ${CFLAGS} -c ${FILESDIR}/cxa_atexit.c \
+ ${FILESDIR}/cxa_finalize.c ${FILESDIR}/errno_location.c \
+ ${FILESDIR}/stderr.c && \
${AR} q opt/intel/compiler60/ia32/lib/libcxa.a *.o
# Some magic to be able to link
- @${SED} 's:@@PREFIX@@:${PREFIX}:g' ${FILESDIR}/ld >${WRKSRC}/opt/intel/compiler60/ia32/bin/ld
+ @${CC} ${CFLAGS} -o ${WRKSRC}/opt/intel/compiler60/ia32/bin/ld ${FILESDIR}/ld.c
+ @${STRIP_CMD} ${WRKSRC}/opt/intel/compiler60/ia32/bin/ld
@${CHMOD} 755 ${WRKSRC}/opt/intel/compiler60/ia32/bin/ld
- @${MKDIR} ${WRKSRC}/opt/intel/compiler60/ia32/bin/real
-# Do not use the linux ld if it exists
- @${LN} -s /usr/bin/ld ${WRKSRC}/opt/intel/compiler60/ia32/bin/real
do-install:
@cd ${WRKSRC}/opt && ${TAR} -cf - . | \
diff --git a/lang/icc/files/cxa_atexit.c b/lang/icc/files/cxa_atexit.c
index 2d9ce3d9160e..d9dd1d0a1700 100644
--- a/lang/icc/files/cxa_atexit.c
+++ b/lang/icc/files/cxa_atexit.c