Merge "Added 7th argument to pooled lambdas"
This commit is contained in:
@@ -4117,6 +4117,8 @@ com.android.internal.util.StateMachine$SmHandler$StateInfo
|
||||
com.android.internal.util.VirtualRefBasePtr
|
||||
com.android.internal.util.XmlUtils
|
||||
com.android.internal.util.XmlUtils$WriteMapCallback
|
||||
com.android.internal.util.function.HeptConsumer
|
||||
com.android.internal.util.function.HeptFunction
|
||||
com.android.internal.util.function.HexConsumer
|
||||
com.android.internal.util.function.HexFunction
|
||||
com.android.internal.util.function.QuadConsumer
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
/*
|
||||
* Copyright (C) 2018 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.internal.util.function;
|
||||
|
||||
import java.util.function.Consumer;
|
||||
|
||||
/**
|
||||
* A 7-argument {@link Consumer}
|
||||
*
|
||||
* @hide
|
||||
*/
|
||||
public interface HeptConsumer<A, B, C, D, E, F, G> {
|
||||
void accept(A a, B b, C c, D d, E e, F f, G g);
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
/*
|
||||
* Copyright (C) 2018 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.internal.util.function;
|
||||
|
||||
import java.util.function.Function;
|
||||
|
||||
/**
|
||||
* A 7-argument {@link Function}
|
||||
*
|
||||
* @hide
|
||||
*/
|
||||
public interface HeptFunction<A, B, C, D, E, F, G, R> {
|
||||
R apply(A a, B b, C c, D d, E e, F f, G g);
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
/*
|
||||
* Copyright (C) 2018 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.internal.util.function;
|
||||
|
||||
import java.util.function.Predicate;
|
||||
|
||||
/**
|
||||
* A 7-argument {@link Predicate}
|
||||
*
|
||||
* @hide
|
||||
*/
|
||||
public interface HeptPredicate<A, B, C, D, E, F, G> {
|
||||
boolean test(A a, B b, C c, D d, E e, F f, G g);
|
||||
}
|
||||
@@ -18,6 +18,8 @@ package com.android.internal.util.function.pooled;
|
||||
|
||||
import com.android.internal.util.FunctionalUtils.ThrowingRunnable;
|
||||
import com.android.internal.util.FunctionalUtils.ThrowingSupplier;
|
||||
import com.android.internal.util.function.HeptConsumer;
|
||||
import com.android.internal.util.function.HeptFunction;
|
||||
import com.android.internal.util.function.HexConsumer;
|
||||
import com.android.internal.util.function.HexFunction;
|
||||
import com.android.internal.util.function.QuadConsumer;
|
||||
@@ -37,59 +39,61 @@ import java.util.function.Function;
|
||||
*
|
||||
* @hide
|
||||
*/
|
||||
abstract class OmniFunction<A, B, C, D, E, F, R> implements
|
||||
abstract class OmniFunction<A, B, C, D, E, F, G, R> implements
|
||||
PooledFunction<A, R>, BiFunction<A, B, R>, TriFunction<A, B, C, R>,
|
||||
QuadFunction<A, B, C, D, R>, QuintFunction<A, B, C, D, E, R>,
|
||||
HexFunction<A, B, C, D, E, F, R>, PooledConsumer<A>, BiConsumer<A, B>,
|
||||
TriConsumer<A, B, C>, QuadConsumer<A, B, C, D>, QuintConsumer<A, B, C, D, E>,
|
||||
HexConsumer<A, B, C, D, E, F>, PooledPredicate<A>, BiPredicate<A, B>,
|
||||
HexFunction<A, B, C, D, E, F, R>, HeptFunction<A, B, C, D, E, F, G, R>,
|
||||
PooledConsumer<A>, BiConsumer<A, B>, TriConsumer<A, B, C>, QuadConsumer<A, B, C, D>,
|
||||
QuintConsumer<A, B, C, D, E>, HexConsumer<A, B, C, D, E, F>,
|
||||
HeptConsumer<A, B, C, D, E, F, G>,
|
||||
PooledPredicate<A>, BiPredicate<A, B>,
|
||||
PooledSupplier<R>, PooledRunnable, ThrowingRunnable, ThrowingSupplier<R>,
|
||||
PooledSupplier.OfInt, PooledSupplier.OfLong, PooledSupplier.OfDouble {
|
||||
|
||||
abstract R invoke(A a, B b, C c, D d, E e, F f);
|
||||
abstract R invoke(A a, B b, C c, D d, E e, F f, G g);
|
||||
|
||||
@Override
|
||||
public R apply(A o, B o2) {
|
||||
return invoke(o, o2, null, null, null, null);
|
||||
return invoke(o, o2, null, null, null, null, null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public R apply(A o) {
|
||||
return invoke(o, null, null, null, null, null);
|
||||
return invoke(o, null, null, null, null, null, null);
|
||||
}
|
||||
|
||||
abstract public <V> OmniFunction<A, B, C, D, E, F, V> andThen(
|
||||
public abstract <V> OmniFunction<A, B, C, D, E, F, G, V> andThen(
|
||||
Function<? super R, ? extends V> after);
|
||||
abstract public OmniFunction<A, B, C, D, E, F, R> negate();
|
||||
public abstract OmniFunction<A, B, C, D, E, F, G, R> negate();
|
||||
|
||||
@Override
|
||||
public void accept(A o, B o2) {
|
||||
invoke(o, o2, null, null, null, null);
|
||||
invoke(o, o2, null, null, null, null, null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void accept(A o) {
|
||||
invoke(o, null, null, null, null, null);
|
||||
invoke(o, null, null, null, null, null, null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
invoke(null, null, null, null, null, null);
|
||||
invoke(null, null, null, null, null, null, null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public R get() {
|
||||
return invoke(null, null, null, null, null, null);
|
||||
return invoke(null, null, null, null, null, null, null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean test(A o, B o2) {
|
||||
return (Boolean) invoke(o, o2, null, null, null, null);
|
||||
return (Boolean) invoke(o, o2, null, null, null, null, null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean test(A o) {
|
||||
return (Boolean) invoke(o, null, null, null, null, null);
|
||||
return (Boolean) invoke(o, null, null, null, null, null, null);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -104,42 +108,52 @@ abstract class OmniFunction<A, B, C, D, E, F, R> implements
|
||||
|
||||
@Override
|
||||
public R apply(A a, B b, C c) {
|
||||
return invoke(a, b, c, null, null, null);
|
||||
return invoke(a, b, c, null, null, null, null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void accept(A a, B b, C c) {
|
||||
invoke(a, b, c, null, null, null);
|
||||
invoke(a, b, c, null, null, null, null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public R apply(A a, B b, C c, D d) {
|
||||
return invoke(a, b, c, d, null, null);
|
||||
return invoke(a, b, c, d, null, null, null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public R apply(A a, B b, C c, D d, E e) {
|
||||
return invoke(a, b, c, d, e, null);
|
||||
return invoke(a, b, c, d, e, null, null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public R apply(A a, B b, C c, D d, E e, F f) {
|
||||
return invoke(a, b, c, d, e, f);
|
||||
return invoke(a, b, c, d, e, f, null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public R apply(A a, B b, C c, D d, E e, F f, G g) {
|
||||
return invoke(a, b, c, d, e, f, g);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void accept(A a, B b, C c, D d) {
|
||||
invoke(a, b, c, d, null, null);
|
||||
invoke(a, b, c, d, null, null, null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void accept(A a, B b, C c, D d, E e) {
|
||||
invoke(a, b, c, d, e, null);
|
||||
invoke(a, b, c, d, e, null, null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void accept(A a, B b, C c, D d, E e, F f) {
|
||||
invoke(a, b, c, d, e, f);
|
||||
invoke(a, b, c, d, e, f, null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void accept(A a, B b, C c, D d, E e, F f, G g) {
|
||||
invoke(a, b, c, d, e, f, g);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -153,5 +167,5 @@ abstract class OmniFunction<A, B, C, D, E, F, R> implements
|
||||
}
|
||||
|
||||
@Override
|
||||
abstract public OmniFunction<A, B, C, D, E, F, R> recycleOnUse();
|
||||
public abstract OmniFunction<A, B, C, D, E, F, G, R> recycleOnUse();
|
||||
}
|
||||
|
||||
@@ -21,6 +21,8 @@ import static com.android.internal.util.function.pooled.PooledLambdaImpl.acquire
|
||||
|
||||
import android.os.Message;
|
||||
|
||||
import com.android.internal.util.function.HeptConsumer;
|
||||
import com.android.internal.util.function.HeptFunction;
|
||||
import com.android.internal.util.function.HexConsumer;
|
||||
import com.android.internal.util.function.HexFunction;
|
||||
import com.android.internal.util.function.QuadConsumer;
|
||||
@@ -174,7 +176,7 @@ public interface PooledLambda {
|
||||
Consumer<? super A> function,
|
||||
A arg1) {
|
||||
return acquire(PooledLambdaImpl.sPool,
|
||||
function, 1, 0, ReturnType.VOID, arg1, null, null, null, null, null);
|
||||
function, 1, 0, ReturnType.VOID, arg1, null, null, null, null, null, null);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -190,7 +192,7 @@ public interface PooledLambda {
|
||||
Predicate<? super A> function,
|
||||
A arg1) {
|
||||
return acquire(PooledLambdaImpl.sPool,
|
||||
function, 1, 0, ReturnType.BOOLEAN, arg1, null, null, null, null, null);
|
||||
function, 1, 0, ReturnType.BOOLEAN, arg1, null, null, null, null, null, null);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -206,7 +208,7 @@ public interface PooledLambda {
|
||||
Function<? super A, ? extends R> function,
|
||||
A arg1) {
|
||||
return acquire(PooledLambdaImpl.sPool,
|
||||
function, 1, 0, ReturnType.OBJECT, arg1, null, null, null, null, null);
|
||||
function, 1, 0, ReturnType.OBJECT, arg1, null, null, null, null, null, null);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -236,7 +238,7 @@ public interface PooledLambda {
|
||||
A arg1) {
|
||||
synchronized (Message.sPoolSync) {
|
||||
PooledRunnable callback = acquire(PooledLambdaImpl.sMessageCallbacksPool,
|
||||
function, 1, 0, ReturnType.VOID, arg1, null, null, null, null, null);
|
||||
function, 1, 0, ReturnType.VOID, arg1, null, null, null, null, null, null);
|
||||
return Message.obtain().setCallback(callback.recycleOnUse());
|
||||
}
|
||||
}
|
||||
@@ -255,7 +257,7 @@ public interface PooledLambda {
|
||||
BiConsumer<? super A, ? super B> function,
|
||||
A arg1, B arg2) {
|
||||
return acquire(PooledLambdaImpl.sPool,
|
||||
function, 2, 0, ReturnType.VOID, arg1, arg2, null, null, null, null);
|
||||
function, 2, 0, ReturnType.VOID, arg1, arg2, null, null, null, null, null);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -272,7 +274,7 @@ public interface PooledLambda {
|
||||
BiPredicate<? super A, ? super B> function,
|
||||
A arg1, B arg2) {
|
||||
return acquire(PooledLambdaImpl.sPool,
|
||||
function, 2, 0, ReturnType.BOOLEAN, arg1, arg2, null, null, null, null);
|
||||
function, 2, 0, ReturnType.BOOLEAN, arg1, arg2, null, null, null, null, null);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -289,7 +291,7 @@ public interface PooledLambda {
|
||||
BiFunction<? super A, ? super B, ? extends R> function,
|
||||
A arg1, B arg2) {
|
||||
return acquire(PooledLambdaImpl.sPool,
|
||||
function, 2, 0, ReturnType.OBJECT, arg1, arg2, null, null, null, null);
|
||||
function, 2, 0, ReturnType.OBJECT, arg1, arg2, null, null, null, null, null);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -306,7 +308,7 @@ public interface PooledLambda {
|
||||
BiConsumer<? super A, ? super B> function,
|
||||
ArgumentPlaceholder<A> arg1, B arg2) {
|
||||
return acquire(PooledLambdaImpl.sPool,
|
||||
function, 2, 1, ReturnType.VOID, arg1, arg2, null, null, null, null);
|
||||
function, 2, 1, ReturnType.VOID, arg1, arg2, null, null, null, null, null);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -323,7 +325,7 @@ public interface PooledLambda {
|
||||
BiPredicate<? super A, ? super B> function,
|
||||
ArgumentPlaceholder<A> arg1, B arg2) {
|
||||
return acquire(PooledLambdaImpl.sPool,
|
||||
function, 2, 1, ReturnType.BOOLEAN, arg1, arg2, null, null, null, null);
|
||||
function, 2, 1, ReturnType.BOOLEAN, arg1, arg2, null, null, null, null, null);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -340,7 +342,7 @@ public interface PooledLambda {
|
||||
BiFunction<? super A, ? super B, ? extends R> function,
|
||||
ArgumentPlaceholder<A> arg1, B arg2) {
|
||||
return acquire(PooledLambdaImpl.sPool,
|
||||
function, 2, 1, ReturnType.OBJECT, arg1, arg2, null, null, null, null);
|
||||
function, 2, 1, ReturnType.OBJECT, arg1, arg2, null, null, null, null, null);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -357,7 +359,7 @@ public interface PooledLambda {
|
||||
BiConsumer<? super A, ? super B> function,
|
||||
A arg1, ArgumentPlaceholder<B> arg2) {
|
||||
return acquire(PooledLambdaImpl.sPool,
|
||||
function, 2, 1, ReturnType.VOID, arg1, arg2, null, null, null, null);
|
||||
function, 2, 1, ReturnType.VOID, arg1, arg2, null, null, null, null, null);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -374,7 +376,7 @@ public interface PooledLambda {
|
||||
BiPredicate<? super A, ? super B> function,
|
||||
A arg1, ArgumentPlaceholder<B> arg2) {
|
||||
return acquire(PooledLambdaImpl.sPool,
|
||||
function, 2, 1, ReturnType.BOOLEAN, arg1, arg2, null, null, null, null);
|
||||
function, 2, 1, ReturnType.BOOLEAN, arg1, arg2, null, null, null, null, null);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -391,7 +393,7 @@ public interface PooledLambda {
|
||||
BiFunction<? super A, ? super B, ? extends R> function,
|
||||
A arg1, ArgumentPlaceholder<B> arg2) {
|
||||
return acquire(PooledLambdaImpl.sPool,
|
||||
function, 2, 1, ReturnType.OBJECT, arg1, arg2, null, null, null, null);
|
||||
function, 2, 1, ReturnType.OBJECT, arg1, arg2, null, null, null, null, null);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -422,7 +424,7 @@ public interface PooledLambda {
|
||||
A arg1, B arg2) {
|
||||
synchronized (Message.sPoolSync) {
|
||||
PooledRunnable callback = acquire(PooledLambdaImpl.sMessageCallbacksPool,
|
||||
function, 2, 0, ReturnType.VOID, arg1, arg2, null, null, null, null);
|
||||
function, 2, 0, ReturnType.VOID, arg1, arg2, null, null, null, null, null);
|
||||
return Message.obtain().setCallback(callback.recycleOnUse());
|
||||
}
|
||||
}
|
||||
@@ -442,7 +444,7 @@ public interface PooledLambda {
|
||||
TriConsumer<? super A, ? super B, ? super C> function,
|
||||
A arg1, B arg2, C arg3) {
|
||||
return acquire(PooledLambdaImpl.sPool,
|
||||
function, 3, 0, ReturnType.VOID, arg1, arg2, arg3, null, null, null);
|
||||
function, 3, 0, ReturnType.VOID, arg1, arg2, arg3, null, null, null, null);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -460,7 +462,7 @@ public interface PooledLambda {
|
||||
TriFunction<? super A, ? super B, ? super C, ? extends R> function,
|
||||
A arg1, B arg2, C arg3) {
|
||||
return acquire(PooledLambdaImpl.sPool,
|
||||
function, 3, 0, ReturnType.OBJECT, arg1, arg2, arg3, null, null, null);
|
||||
function, 3, 0, ReturnType.OBJECT, arg1, arg2, arg3, null, null, null, null);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -478,7 +480,7 @@ public interface PooledLambda {
|
||||
TriConsumer<? super A, ? super B, ? super C> function,
|
||||
ArgumentPlaceholder<A> arg1, B arg2, C arg3) {
|
||||
return acquire(PooledLambdaImpl.sPool,
|
||||
function, 3, 1, ReturnType.VOID, arg1, arg2, arg3, null, null, null);
|
||||
function, 3, 1, ReturnType.VOID, arg1, arg2, arg3, null, null, null, null);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -496,7 +498,7 @@ public interface PooledLambda {
|
||||
TriFunction<? super A, ? super B, ? super C, ? extends R> function,
|
||||
ArgumentPlaceholder<A> arg1, B arg2, C arg3) {
|
||||
return acquire(PooledLambdaImpl.sPool,
|
||||
function, 3, 1, ReturnType.OBJECT, arg1, arg2, arg3, null, null, null);
|
||||
function, 3, 1, ReturnType.OBJECT, arg1, arg2, arg3, null, null, null, null);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -514,7 +516,7 @@ public interface PooledLambda {
|
||||
TriConsumer<? super A, ? super B, ? super C> function,
|
||||
A arg1, ArgumentPlaceholder<B> arg2, C arg3) {
|
||||
return acquire(PooledLambdaImpl.sPool,
|
||||
function, 3, 1, ReturnType.VOID, arg1, arg2, arg3, null, null, null);
|
||||
function, 3, 1, ReturnType.VOID, arg1, arg2, arg3, null, null, null, null);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -532,7 +534,7 @@ public interface PooledLambda {
|
||||
TriFunction<? super A, ? super B, ? super C, ? extends R> function,
|
||||
A arg1, ArgumentPlaceholder<B> arg2, C arg3) {
|
||||
return acquire(PooledLambdaImpl.sPool,
|
||||
function, 3, 1, ReturnType.OBJECT, arg1, arg2, arg3, null, null, null);
|
||||
function, 3, 1, ReturnType.OBJECT, arg1, arg2, arg3, null, null, null, null);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -550,7 +552,7 @@ public interface PooledLambda {
|
||||
TriConsumer<? super A, ? super B, ? super C> function,
|
||||
A arg1, B arg2, ArgumentPlaceholder<C> arg3) {
|
||||
return acquire(PooledLambdaImpl.sPool,
|
||||
function, 3, 1, ReturnType.VOID, arg1, arg2, arg3, null, null, null);
|
||||
function, 3, 1, ReturnType.VOID, arg1, arg2, arg3, null, null, null, null);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -568,7 +570,7 @@ public interface PooledLambda {
|
||||
TriFunction<? super A, ? super B, ? super C, ? extends R> function,
|
||||
A arg1, B arg2, ArgumentPlaceholder<C> arg3) {
|
||||
return acquire(PooledLambdaImpl.sPool,
|
||||
function, 3, 1, ReturnType.OBJECT, arg1, arg2, arg3, null, null, null);
|
||||
function, 3, 1, ReturnType.OBJECT, arg1, arg2, arg3, null, null, null, null);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -600,7 +602,7 @@ public interface PooledLambda {
|
||||
A arg1, B arg2, C arg3) {
|
||||
synchronized (Message.sPoolSync) {
|
||||
PooledRunnable callback = acquire(PooledLambdaImpl.sMessageCallbacksPool,
|
||||
function, 3, 0, ReturnType.VOID, arg1, arg2, arg3, null, null, null);
|
||||
function, 3, 0, ReturnType.VOID, arg1, arg2, arg3, null, null, null, null);
|
||||
return Message.obtain().setCallback(callback.recycleOnUse());
|
||||
}
|
||||
}
|
||||
@@ -621,7 +623,7 @@ public interface PooledLambda {
|
||||
QuadConsumer<? super A, ? super B, ? super C, ? super D> function,
|
||||
A arg1, B arg2, C arg3, D arg4) {
|
||||
return acquire(PooledLambdaImpl.sPool,
|
||||
function, 4, 0, ReturnType.VOID, arg1, arg2, arg3, arg4, null, null);
|
||||
function, 4, 0, ReturnType.VOID, arg1, arg2, arg3, arg4, null, null, null);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -640,7 +642,7 @@ public interface PooledLambda {
|
||||
QuadFunction<? super A, ? super B, ? super C, ? super D, ? extends R> function,
|
||||
A arg1, B arg2, C arg3, D arg4) {
|
||||
return acquire(PooledLambdaImpl.sPool,
|
||||
function, 4, 0, ReturnType.OBJECT, arg1, arg2, arg3, arg4, null, null);
|
||||
function, 4, 0, ReturnType.OBJECT, arg1, arg2, arg3, arg4, null, null, null);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -659,7 +661,7 @@ public interface PooledLambda {
|
||||
QuadConsumer<? super A, ? super B, ? super C, ? super D> function,
|
||||
ArgumentPlaceholder<A> arg1, B arg2, C arg3, D arg4) {
|
||||
return acquire(PooledLambdaImpl.sPool,
|
||||
function, 4, 1, ReturnType.VOID, arg1, arg2, arg3, arg4, null, null);
|
||||
function, 4, 1, ReturnType.VOID, arg1, arg2, arg3, arg4, null, null, null);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -678,7 +680,7 @@ public interface PooledLambda {
|
||||
QuadFunction<? super A, ? super B, ? super C, ? super D, ? extends R> function,
|
||||
ArgumentPlaceholder<A> arg1, B arg2, C arg3, D arg4) {
|
||||
return acquire(PooledLambdaImpl.sPool,
|
||||
function, 4, 1, ReturnType.OBJECT, arg1, arg2, arg3, arg4, null, null);
|
||||
function, 4, 1, ReturnType.OBJECT, arg1, arg2, arg3, arg4, null, null, null);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -697,7 +699,7 @@ public interface PooledLambda {
|
||||
QuadConsumer<? super A, ? super B, ? super C, ? super D> function,
|
||||
A arg1, ArgumentPlaceholder<B> arg2, C arg3, D arg4) {
|
||||
return acquire(PooledLambdaImpl.sPool,
|
||||
function, 4, 1, ReturnType.VOID, arg1, arg2, arg3, arg4, null, null);
|
||||
function, 4, 1, ReturnType.VOID, arg1, arg2, arg3, arg4, null, null, null);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -716,7 +718,7 @@ public interface PooledLambda {
|
||||
QuadFunction<? super A, ? super B, ? super C, ? super D, ? extends R> function,
|
||||
A arg1, ArgumentPlaceholder<B> arg2, C arg3, D arg4) {
|
||||
return acquire(PooledLambdaImpl.sPool,
|
||||
function, 4, 1, ReturnType.OBJECT, arg1, arg2, arg3, arg4, null, null);
|
||||
function, 4, 1, ReturnType.OBJECT, arg1, arg2, arg3, arg4, null, null, null);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -735,7 +737,7 @@ public interface PooledLambda {
|
||||
QuadConsumer<? super A, ? super B, ? super C, ? super D> function,
|
||||
A arg1, B arg2, ArgumentPlaceholder<C> arg3, D arg4) {
|
||||
return acquire(PooledLambdaImpl.sPool,
|
||||
function, 4, 1, ReturnType.VOID, arg1, arg2, arg3, arg4, null, null);
|
||||
function, 4, 1, ReturnType.VOID, arg1, arg2, arg3, arg4, null, null, null);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -754,7 +756,7 @@ public interface PooledLambda {
|
||||
QuadFunction<? super A, ? super B, ? super C, ? super D, ? extends R> function,
|
||||
A arg1, B arg2, ArgumentPlaceholder<C> arg3, D arg4) {
|
||||
return acquire(PooledLambdaImpl.sPool,
|
||||
function, 4, 1, ReturnType.OBJECT, arg1, arg2, arg3, arg4, null, null);
|
||||
function, 4, 1, ReturnType.OBJECT, arg1, arg2, arg3, arg4, null, null, null);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -773,7 +775,7 @@ public interface PooledLambda {
|
||||
QuadConsumer<? super A, ? super B, ? super C, ? super D> function,
|
||||
A arg1, B arg2, C arg3, ArgumentPlaceholder<D> arg4) {
|
||||
return acquire(PooledLambdaImpl.sPool,
|
||||
function, 4, 1, ReturnType.VOID, arg1, arg2, arg3, arg4, null, null);
|
||||
function, 4, 1, ReturnType.VOID, arg1, arg2, arg3, arg4, null, null, null);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -792,7 +794,7 @@ public interface PooledLambda {
|
||||
QuadFunction<? super A, ? super B, ? super C, ? super D, ? extends R> function,
|
||||
A arg1, B arg2, C arg3, ArgumentPlaceholder<D> arg4) {
|
||||
return acquire(PooledLambdaImpl.sPool,
|
||||
function, 4, 1, ReturnType.OBJECT, arg1, arg2, arg3, arg4, null, null);
|
||||
function, 4, 1, ReturnType.OBJECT, arg1, arg2, arg3, arg4, null, null, null);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -825,7 +827,7 @@ public interface PooledLambda {
|
||||
A arg1, B arg2, C arg3, D arg4) {
|
||||
synchronized (Message.sPoolSync) {
|
||||
PooledRunnable callback = acquire(PooledLambdaImpl.sMessageCallbacksPool,
|
||||
function, 4, 0, ReturnType.VOID, arg1, arg2, arg3, arg4, null, null);
|
||||
function, 4, 0, ReturnType.VOID, arg1, arg2, arg3, arg4, null, null, null);
|
||||
return Message.obtain().setCallback(callback.recycleOnUse());
|
||||
}
|
||||
}
|
||||
@@ -847,7 +849,7 @@ public interface PooledLambda {
|
||||
QuintConsumer<? super A, ? super B, ? super C, ? super D, ? super E> function,
|
||||
A arg1, B arg2, C arg3, D arg4, E arg5) {
|
||||
return acquire(PooledLambdaImpl.sPool,
|
||||
function, 5, 0, ReturnType.VOID, arg1, arg2, arg3, arg4, arg5, null);
|
||||
function, 5, 0, ReturnType.VOID, arg1, arg2, arg3, arg4, arg5, null, null);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -867,7 +869,7 @@ public interface PooledLambda {
|
||||
QuintFunction<? super A, ? super B, ? super C, ? super D, ? super E, ? extends R>
|
||||
function, A arg1, B arg2, C arg3, D arg4, E arg5) {
|
||||
return acquire(PooledLambdaImpl.sPool,
|
||||
function, 5, 0, ReturnType.OBJECT, arg1, arg2, arg3, arg4, arg5, null);
|
||||
function, 5, 0, ReturnType.OBJECT, arg1, arg2, arg3, arg4, arg5, null, null);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -902,7 +904,7 @@ public interface PooledLambda {
|
||||
A arg1, B arg2, C arg3, D arg4, E arg5) {
|
||||
synchronized (Message.sPoolSync) {
|
||||
PooledRunnable callback = acquire(PooledLambdaImpl.sMessageCallbacksPool,
|
||||
function, 5, 0, ReturnType.VOID, arg1, arg2, arg3, arg4, arg5, null);
|
||||
function, 5, 0, ReturnType.VOID, arg1, arg2, arg3, arg4, arg5, null, null);
|
||||
return Message.obtain().setCallback(callback.recycleOnUse());
|
||||
}
|
||||
}
|
||||
@@ -925,7 +927,7 @@ public interface PooledLambda {
|
||||
HexConsumer<? super A, ? super B, ? super C, ? super D, ? super E, ? super F> function,
|
||||
A arg1, B arg2, C arg3, D arg4, E arg5, F arg6) {
|
||||
return acquire(PooledLambdaImpl.sPool,
|
||||
function, 6, 0, ReturnType.VOID, arg1, arg2, arg3, arg4, arg5, arg6);
|
||||
function, 6, 0, ReturnType.VOID, arg1, arg2, arg3, arg4, arg5, arg6, null);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -946,7 +948,7 @@ public interface PooledLambda {
|
||||
HexFunction<? super A, ? super B, ? super C, ? super D, ? super E, ? super F,
|
||||
? extends R> function, A arg1, B arg2, C arg3, D arg4, E arg5, F arg6) {
|
||||
return acquire(PooledLambdaImpl.sPool,
|
||||
function, 6, 0, ReturnType.OBJECT, arg1, arg2, arg3, arg4, arg5, arg6);
|
||||
function, 6, 0, ReturnType.OBJECT, arg1, arg2, arg3, arg4, arg5, arg6, null);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -982,7 +984,91 @@ public interface PooledLambda {
|
||||
A arg1, B arg2, C arg3, D arg4, E arg5, F arg6) {
|
||||
synchronized (Message.sPoolSync) {
|
||||
PooledRunnable callback = acquire(PooledLambdaImpl.sMessageCallbacksPool,
|
||||
function, 6, 0, ReturnType.VOID, arg1, arg2, arg3, arg4, arg5, arg6);
|
||||
function, 6, 0, ReturnType.VOID, arg1, arg2, arg3, arg4, arg5, arg6, null);
|
||||
return Message.obtain().setCallback(callback.recycleOnUse());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* {@link PooledRunnable} factory
|
||||
*
|
||||
* @param function non-capturing lambda(typically an unbounded method reference)
|
||||
* to be invoked on call
|
||||
* @param arg1 parameter supplied to {@code function} on call
|
||||
* @param arg2 parameter supplied to {@code function} on call
|
||||
* @param arg3 parameter supplied to {@code function} on call
|
||||
* @param arg4 parameter supplied to {@code function} on call
|
||||
* @param arg5 parameter supplied to {@code function} on call
|
||||
* @param arg6 parameter supplied to {@code function} on call
|
||||
* @param arg7 parameter supplied to {@code function} on call
|
||||
* @return a {@link PooledRunnable}, equivalent to lambda:
|
||||
* {@code () -> function(arg1, arg2, arg3, arg4, arg5, arg6, arg7) }
|
||||
*/
|
||||
static <A, B, C, D, E, F, G> PooledRunnable obtainRunnable(
|
||||
HeptConsumer<? super A, ? super B, ? super C, ? super D, ? super E, ? super F,
|
||||
? super G> function, A arg1, B arg2, C arg3, D arg4, E arg5, F arg6, G arg7) {
|
||||
return acquire(PooledLambdaImpl.sPool,
|
||||
function, 7, 0, ReturnType.VOID, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@link PooledSupplier} factory
|
||||
*
|
||||
* @param function non-capturing lambda(typically an unbounded method reference)
|
||||
* to be invoked on call
|
||||
* @param arg1 parameter supplied to {@code function} on call
|
||||
* @param arg2 parameter supplied to {@code function} on call
|
||||
* @param arg3 parameter supplied to {@code function} on call
|
||||
* @param arg4 parameter supplied to {@code function} on call
|
||||
* @param arg5 parameter supplied to {@code function} on call
|
||||
* @param arg6 parameter supplied to {@code function} on call
|
||||
* @param arg7 parameter supplied to {@code function} on call
|
||||
* @return a {@link PooledSupplier}, equivalent to lambda:
|
||||
* {@code () -> function(arg1, arg2, arg3, arg4, arg5, arg6, arg7) }
|
||||
*/
|
||||
static <A, B, C, D, E, F, G, R> PooledSupplier<R> obtainSupplier(
|
||||
HeptFunction<? super A, ? super B, ? super C, ? super D, ? super E, ? super F,
|
||||
? super G, ? extends R> function,
|
||||
A arg1, B arg2, C arg3, D arg4, E arg5, F arg6, G arg7) {
|
||||
return acquire(PooledLambdaImpl.sPool,
|
||||
function, 7, 0, ReturnType.OBJECT, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
|
||||
}
|
||||
|
||||
/**
|
||||
* Factory of {@link Message}s that contain an
|
||||
* ({@link PooledLambda#recycleOnUse auto-recycling}) {@link PooledRunnable} as its
|
||||
* {@link Message#getCallback internal callback}.
|
||||
*
|
||||
* The callback is equivalent to one obtainable via
|
||||
* {@link #obtainRunnable(QuintConsumer, Object, Object, Object, Object, Object)}
|
||||
*
|
||||
* Note that using this method with {@link android.os.Handler#handleMessage}
|
||||
* is more efficient than the alternative of {@link android.os.Handler#post}
|
||||
* with a {@link PooledRunnable} due to the lack of 2 separate synchronization points
|
||||
* when obtaining {@link Message} and {@link PooledRunnable} from pools separately
|
||||
*
|
||||
* You may optionally set a {@link Message#what} for the message if you want to be
|
||||
* able to cancel it via {@link android.os.Handler#removeMessages}, but otherwise
|
||||
* there's no need to do so
|
||||
*
|
||||
* @param function non-capturing lambda(typically an unbounded method reference)
|
||||
* to be invoked on call
|
||||
* @param arg1 parameter supplied to {@code function} on call
|
||||
* @param arg2 parameter supplied to {@code function} on call
|
||||
* @param arg3 parameter supplied to {@code function} on call
|
||||
* @param arg4 parameter supplied to {@code function} on call
|
||||
* @param arg5 parameter supplied to {@code function} on call
|
||||
* @param arg6 parameter supplied to {@code function} on call
|
||||
* @param arg7 parameter supplied to {@code function} on call
|
||||
* @return a {@link Message} invoking {@code function(arg1, arg2, arg3, arg4, arg5, arg6,
|
||||
* arg7) } when handled
|
||||
*/
|
||||
static <A, B, C, D, E, F, G> Message obtainMessage(
|
||||
HeptConsumer<? super A, ? super B, ? super C, ? super D, ? super E, ? super F,
|
||||
? super G> function, A arg1, B arg2, C arg3, D arg4, E arg5, F arg6, G arg7) {
|
||||
synchronized (Message.sPoolSync) {
|
||||
PooledRunnable callback = acquire(PooledLambdaImpl.sMessageCallbacksPool,
|
||||
function, 7, 0, ReturnType.VOID, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
|
||||
return Message.obtain().setCallback(callback.recycleOnUse());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -24,6 +24,9 @@ import android.util.Pools;
|
||||
|
||||
import com.android.internal.util.ArrayUtils;
|
||||
import com.android.internal.util.BitUtils;
|
||||
import com.android.internal.util.function.HeptConsumer;
|
||||
import com.android.internal.util.function.HeptFunction;
|
||||
import com.android.internal.util.function.HeptPredicate;
|
||||
import com.android.internal.util.function.HexConsumer;
|
||||
import com.android.internal.util.function.HexFunction;
|
||||
import com.android.internal.util.function.HexPredicate;
|
||||
@@ -51,12 +54,12 @@ import java.util.function.Supplier;
|
||||
* @hide
|
||||
*/
|
||||
final class PooledLambdaImpl<R> extends OmniFunction<Object,
|
||||
Object, Object, Object, Object, Object, R> {
|
||||
Object, Object, Object, Object, Object, Object, R> {
|
||||
|
||||
private static final boolean DEBUG = false;
|
||||
private static final String LOG_TAG = "PooledLambdaImpl";
|
||||
|
||||
private static final int MAX_ARGS = 5;
|
||||
private static final int MAX_ARGS = 7;
|
||||
|
||||
private static final int MAX_POOL_SIZE = 50;
|
||||
|
||||
@@ -122,7 +125,7 @@ final class PooledLambdaImpl<R> extends OmniFunction<Object,
|
||||
|
||||
/**
|
||||
* Bit schema:
|
||||
* AAAABCDEEEEEEFFFFFF
|
||||
* AAAAAAABCDEEEEEEFFFFFF
|
||||
*
|
||||
* Where:
|
||||
* A - whether {@link #mArgs arg} at corresponding index was specified at
|
||||
@@ -158,17 +161,17 @@ final class PooledLambdaImpl<R> extends OmniFunction<Object,
|
||||
}
|
||||
|
||||
@Override
|
||||
R invoke(Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) {
|
||||
R invoke(Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) {
|
||||
checkNotRecycled();
|
||||
if (DEBUG) {
|
||||
Log.i(LOG_TAG, this + ".invoke("
|
||||
+ commaSeparateFirstN(
|
||||
new Object[] { a1, a2, a3, a4, a5, a6 },
|
||||
new Object[] { a1, a2, a3, a4, a5, a6, a7 },
|
||||
LambdaType.decodeArgCount(getFlags(MASK_EXPOSED_AS)))
|
||||
+ ")");
|
||||
}
|
||||
final boolean notUsed = fillInArg(a1) && fillInArg(a2) && fillInArg(a3)
|
||||
&& fillInArg(a4) && fillInArg(a5) && fillInArg(a6);
|
||||
&& fillInArg(a4) && fillInArg(a5) && fillInArg(a6) && fillInArg(a7);
|
||||
int argCount = LambdaType.decodeArgCount(getFlags(MASK_FUNC_TYPE));
|
||||
if (argCount != LambdaType.MASK_ARG_COUNT) {
|
||||
for (int i = 0; i < argCount; i++) {
|
||||
@@ -333,6 +336,27 @@ final class PooledLambdaImpl<R> extends OmniFunction<Object,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
case 7: {
|
||||
switch (returnType) {
|
||||
case LambdaType.ReturnType.VOID: {
|
||||
((HeptConsumer) mFunc).accept(popArg(0), popArg(1),
|
||||
popArg(2), popArg(3), popArg(4),
|
||||
popArg(5), popArg(6));
|
||||
return null;
|
||||
}
|
||||
case LambdaType.ReturnType.BOOLEAN: {
|
||||
return (R) (Object) ((HeptPredicate) mFunc).test(popArg(0),
|
||||
popArg(1), popArg(2), popArg(3),
|
||||
popArg(4), popArg(5), popArg(6));
|
||||
}
|
||||
case LambdaType.ReturnType.OBJECT: {
|
||||
return (R) ((HeptFunction) mFunc).apply(popArg(0), popArg(1),
|
||||
popArg(2), popArg(3), popArg(4),
|
||||
popArg(5), popArg(6));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
throw new IllegalStateException("Unknown function type: " + LambdaType.toString(funcType));
|
||||
}
|
||||
@@ -396,7 +420,7 @@ final class PooledLambdaImpl<R> extends OmniFunction<Object,
|
||||
*/
|
||||
static <E extends PooledLambda> E acquire(Pool pool, Object func,
|
||||
int fNumArgs, int numPlaceholders, int fReturnType,
|
||||
Object a, Object b, Object c, Object d, Object e, Object f) {
|
||||
Object a, Object b, Object c, Object d, Object e, Object f, Object g) {
|
||||
PooledLambdaImpl r = acquire(pool);
|
||||
if (DEBUG) {
|
||||
Log.i(LOG_TAG,
|
||||
@@ -411,6 +435,7 @@ final class PooledLambdaImpl<R> extends OmniFunction<Object,
|
||||
+ ", d = " + d
|
||||
+ ", e = " + e
|
||||
+ ", f = " + f
|
||||
+ ", g = " + g
|
||||
+ ")");
|
||||
}
|
||||
r.mFunc = func;
|
||||
@@ -423,6 +448,7 @@ final class PooledLambdaImpl<R> extends OmniFunction<Object,
|
||||
setIfInBounds(r.mArgs, 3, d);
|
||||
setIfInBounds(r.mArgs, 4, e);
|
||||
setIfInBounds(r.mArgs, 5, f);
|
||||
setIfInBounds(r.mArgs, 6, g);
|
||||
return (E) r;
|
||||
}
|
||||
|
||||
@@ -448,12 +474,12 @@ final class PooledLambdaImpl<R> extends OmniFunction<Object,
|
||||
}
|
||||
|
||||
@Override
|
||||
public OmniFunction<Object, Object, Object, Object, Object, Object, R> negate() {
|
||||
public OmniFunction<Object, Object, Object, Object, Object, Object, Object, R> negate() {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public <V> OmniFunction<Object, Object, Object, Object, Object, Object, V> andThen(
|
||||
public <V> OmniFunction<Object, Object, Object, Object, Object, Object, Object, V> andThen(
|
||||
Function<? super R, ? extends V> after) {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
@@ -474,7 +500,7 @@ final class PooledLambdaImpl<R> extends OmniFunction<Object,
|
||||
}
|
||||
|
||||
@Override
|
||||
public OmniFunction<Object, Object, Object, Object, Object, Object, R> recycleOnUse() {
|
||||
public OmniFunction<Object, Object, Object, Object, Object, Object, Object, R> recycleOnUse() {
|
||||
if (DEBUG) Log.i(LOG_TAG, this + ".recycleOnUse()");
|
||||
mFlags |= FLAG_RECYCLE_ON_USE;
|
||||
return this;
|
||||
@@ -519,10 +545,10 @@ final class PooledLambdaImpl<R> extends OmniFunction<Object,
|
||||
* Contract for encoding a supported lambda type in {@link #MASK_BIT_COUNT} bits
|
||||
*/
|
||||
static class LambdaType {
|
||||
public static final int MASK_ARG_COUNT = 0b111;
|
||||
public static final int MASK_RETURN_TYPE = 0b111000;
|
||||
public static final int MASK_ARG_COUNT = 0b1111;
|
||||
public static final int MASK_RETURN_TYPE = 0b1110000;
|
||||
public static final int MASK = MASK_ARG_COUNT | MASK_RETURN_TYPE;
|
||||
public static final int MASK_BIT_COUNT = 6;
|
||||
public static final int MASK_BIT_COUNT = 7;
|
||||
|
||||
static int encode(int argCount, int returnType) {
|
||||
return mask(MASK_ARG_COUNT, argCount) | mask(MASK_RETURN_TYPE, returnType);
|
||||
@@ -557,6 +583,7 @@ final class PooledLambdaImpl<R> extends OmniFunction<Object,
|
||||
case 4: return "Quad";
|
||||
case 5: return "Quint";
|
||||
case 6: return "Hex";
|
||||
case 7: return "Hept";
|
||||
default: throw new IllegalArgumentException("" + argCount);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user