Skip to content

Commit

Permalink
in-progress pre-review feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
niloc132 committed Dec 13, 2023
1 parent f033ea2 commit 48fa48b
Show file tree
Hide file tree
Showing 4 changed files with 58 additions and 51 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,8 @@ public PythonDeephavenSession(

private void registerJavaExecutor() {
// TODO (deephaven-core#4040) Temporary exec service until we have cleaner startup wiring
try (final PythonDeephavenThreadsModule module = PyModule.importModule("deephaven.threads").createProxy(PythonDeephavenThreadsModule.class)) {
try (PyModule pyModule = PyModule.importModule("deephaven.server.executors");
final PythonDeephavenThreadsModule module = pyModule.createProxy(PythonDeephavenThreadsModule.class)) {
ExecutorService executorService = Executors.newFixedThreadPool(1);
module._register_named_java_executor("serial", executorService::submit);
module._register_named_java_executor("concurrent", executorService::submit);
Expand Down
3 changes: 0 additions & 3 deletions py/server/deephaven/server/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
#
# Copyright (c) 2016-2022 Deephaven Data Labs and Patent Pending
#

# Packages under the deephaven.server heading are not meant to be called externally - it exists as a convenient place
# for the server to execute implementation logic via python
56 changes: 56 additions & 0 deletions py/server/deephaven/server/executors.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
#
# Copyright (c) 2016-2022 Deephaven Data Labs and Patent Pending
#
"""
Support for running operations on JVM server threads, so that they can be given work from python. Initially, there
are two executors, "serial" and "concurrent". Any task that will take an exclusive UGP lock should use the serial
executor, otherwise the concurrent executor should be used. In the future there may be a "fast" executor, for use
when there is no chance of using either lock.
"""

from typing import Callable, Dict, List
import jpy
from deephaven.jcompat import j_runnable


_executors: Dict[str, Callable[[Callable[[], None]], None]] = {}


def has_named_executor(executor_name: str) -> bool:
"""
Returns True if the named executor exists and can have tasks submitted to it.
"""
return executor_name in executor_names()


def executor_names() -> List[str]:
"""
Returns: the List of known executor names
"""
return list(_executors.keys())


def submit_task(executor_name: str, task: Callable[[], None]) -> None:
"""
Submits a task to run on a named executor. If no such executor exists, raises KeyError.
Typically, tasks should not block on other threads. Ensure tasks never block on other tasks submitted to the same executor.
Args:
executor_name: the name of the executor to submit the task to
task: the function to run on the named executor
Raises: KeyError if the executor name
"""
_executors[executor_name](task)


def _register_named_java_executor(executor_name: str, java_executor: jpy.JType) -> None:
"""
Provides a Java executor for user code to submit tasks to.
Args:
executor_name: the name of the executor to register
java_executor: a Java Consumer<Runnable> instance
"""
_executors[executor_name] = lambda task: java_executor.accept(j_runnable(task))
47 changes: 0 additions & 47 deletions py/server/deephaven/threads.py

This file was deleted.

0 comments on commit 48fa48b

Please sign in to comment.