X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Fjsite%2Fcore%2FRequestManager.java;h=b6da95be2e019403fef404ed808dd9cd843f582a;hb=c63257e8cc0ba1a5aca9364b22171abe7279d479;hp=002cd17748ecbf4f5ac60d56054148786daf59d8;hpb=f58c676a286a7cd8d37c3f510e787144a9bff5ad;p=jSite2.git diff --git a/src/net/pterodactylus/jsite/core/RequestManager.java b/src/net/pterodactylus/jsite/core/RequestManager.java index 002cd17..b6da95b 100644 --- a/src/net/pterodactylus/jsite/core/RequestManager.java +++ b/src/net/pterodactylus/jsite/core/RequestManager.java @@ -25,17 +25,21 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; +import net.pterodactylus.fcp.highlevel.GetRequestResult; import net.pterodactylus.fcp.highlevel.HighLevelCallback; import net.pterodactylus.fcp.highlevel.HighLevelCallbackListener; import net.pterodactylus.fcp.highlevel.HighLevelClient; +import net.pterodactylus.fcp.highlevel.HighLevelException; import net.pterodactylus.fcp.highlevel.HighLevelProgress; import net.pterodactylus.fcp.highlevel.HighLevelProgressListener; +import net.pterodactylus.fcp.highlevel.PutDirRequestResult; +import net.pterodactylus.fcp.highlevel.PutRequestResult; import net.pterodactylus.fcp.highlevel.RequestListResult; import net.pterodactylus.fcp.highlevel.RequestResult; +import net.pterodactylus.jsite.core.Request.Type; import net.pterodactylus.util.logging.Logging; /** @@ -43,9 +47,8 @@ import net.pterodactylus.util.logging.Logging; * The request manager is added to the {@link NodeManager} as a * {@link NodeListener} so that it can fire request-removed events in case a * node is disconnected. - * + * * @author David ‘Bombe’ Roden <bombe@freenetproject.org> - * @version $Id$ */ public class RequestManager implements NodeListener, HighLevelProgressListener { @@ -60,7 +63,7 @@ public class RequestManager implements NodeListener, HighLevelProgressListener { /** Request lists for all nodes. */ @SuppressWarnings("unused") - private Map> nodeRequests = Collections.synchronizedMap(new HashMap>()); + private Map> nodeRequests = Collections.synchronizedMap(new HashMap>()); // // EVENT MANAGEMENT @@ -68,7 +71,7 @@ public class RequestManager implements NodeListener, HighLevelProgressListener { /** * Adds a request listener. - * + * * @param requestListener * The request listener to add */ @@ -78,7 +81,7 @@ public class RequestManager implements NodeListener, HighLevelProgressListener { /** * Removes a request listener. - * + * * @param requestListener * The request listener to remove */ @@ -88,42 +91,65 @@ public class RequestManager implements NodeListener, HighLevelProgressListener { /** * Notifies all listeners that a request was added. - * - * @param node - * The node that added the request + * * @param request * The request that was added */ - private void fireRequestAdded(Node node, Request request) { - for (RequestListener requestListener: requestListeners) { - requestListener.requestAdded(node, request); + private void fireRequestAdded(Request request) { + for (RequestListener requestListener : requestListeners) { + requestListener.requestAdded(request); } } /** * Notifies all listeners that a request progressed. - * - * @param node - * The node that runs the request + * * @param request * The request - * @param totalBlocks - * The total number of blocks - * @param requiredBlocks - * The number of required blocks - * @param successfulBlocks - * The number of successful blocks - * @param failedBlocks - * The number of failed blocks - * @param fatallyFailedBlocks - * The number of fatally failed blocks - * @param finalizedTotal - * true if the total number of blocks in final, - * false otherwise */ - private void fireRequestProgressed(Node node, Request request, int totalBlocks, int requiredBlocks, int successfulBlocks, int failedBlocks, int fatallyFailedBlocks, boolean finalizedTotal) { - for (RequestListener requestListener: requestListeners) { - requestListener.requestProgressed(node, request, totalBlocks, requiredBlocks, successfulBlocks, failedBlocks, fatallyFailedBlocks, finalizedTotal); + private void fireRequestProgressed(Request request) { + for (RequestListener requestListener : requestListeners) { + requestListener.requestProgressed(request); + } + } + + /** + * Notifies all listeners that a request was removed. + * + * @param request + * The request that was removed + */ + private void fireRequestRemoved(Request request) { + for (RequestListener requestListener : requestListeners) { + requestListener.requestRemoved(request); + } + } + + /** + * Notifies all listeners that a request has finished. + * + * @see RequestListener#requestFinished(Request) + * @param request + * The request that has finished + */ + private void fireRequestFinished(Request request) { + for (RequestListener requestListener : requestListeners) { + requestListener.requestFinished(request); + } + } + + /** + * Notifies all listeners that a request has generated a URI. + * + * @see RequestListener#requestGeneratedURI(Request, String) + * @param request + * The request that has generated a URI + * @param uri + * The generated URI + */ + private void fireRequestGeneratedURI(Request request, String uri) { + for (RequestListener requestListener : requestListeners) { + requestListener.requestGeneratedURI(request, uri); } } @@ -133,7 +159,7 @@ public class RequestManager implements NodeListener, HighLevelProgressListener { /** * Sets the node manager to use. - * + * * @param nodeManager * The node manager */ @@ -152,37 +178,63 @@ public class RequestManager implements NodeListener, HighLevelProgressListener { /** * Requests a list of all running requests from a node. This method will * block until the request has been sent! - * + * * @param node * The node to get all requests for * @throws IOException * if an I/O error occurs while communicating with the node + * @throws JSiteException + * if there is a problem with the node */ - private void getRequests(final Node node) throws IOException { + private void getRequests(final Node node) throws IOException, JSiteException { HighLevelClient highLevelClient = nodeManager.getHighLevelClient(node); if (highLevelClient == null) { logger.log(Level.WARNING, "no client for node: " + node); return; } - HighLevelCallback requestListCallback = highLevelClient.getRequests(); - requestListCallback.addHighLevelCallbackListener(new HighLevelCallbackListener() { + final Map identifierRequests = Collections.synchronizedMap(new HashMap()); + nodeRequests.put(node, identifierRequests); + HighLevelCallback requestListCallback; + try { + requestListCallback = highLevelClient.getRequests(); + requestListCallback.addHighLevelCallbackListener(new HighLevelCallbackListener() { - @SuppressWarnings("synthetic-access") - public void gotResult(HighLevelCallback highLevelCallback) { - RequestListResult requestListResult; - try { - requestListResult = highLevelCallback.getResult(); - } catch (InterruptedException e) { - logger.log(Level.SEVERE, "getResult() blocked and was interrupted"); - return; + @SuppressWarnings("synthetic-access") + public void gotResult(HighLevelCallback highLevelCallback) { + RequestListResult requestListResult; + try { + requestListResult = highLevelCallback.getResult(); + } catch (InterruptedException e) { + logger.log(Level.SEVERE, "getResult() blocked and was interrupted"); + return; + } + for (RequestResult requestResult : requestListResult) { + String identifier = requestResult.getIdentifier(); + logger.log(Level.FINER, "got identifier: " + identifier); + Request request = identifierRequests.get(identifier); + if (request == null) { + request = new Request(node, identifier); + } + if (request.getType() == null) { + if (requestResult instanceof GetRequestResult) { + request.setType(Type.get); + } else if (requestResult instanceof PutRequestResult) { + request.setType(Type.put); + } else if (requestResult instanceof PutDirRequestResult) { + request.setType(Type.putDir); + } + } + if (identifierRequests.containsKey(identifier)) { + continue; + } + identifierRequests.put(requestResult.getIdentifier(), request); + fireRequestAdded(request); + } } - for (RequestResult requestResult: requestListResult) { - Request request = new Request(requestResult.getIdentifier()); - /* TODO - fill request */ - fireRequestAdded(node, request); - } - } - }); + }); + } catch (HighLevelException hle1) { + throw new BackendException(hle1); + } } // @@ -225,6 +277,10 @@ public class RequestManager implements NodeListener, HighLevelProgressListener { try { highLevelClient.setWatchGlobal(true); getRequests(node); + } catch (HighLevelException hle1) { + logger.log(Level.WARNING, "error in backend", hle1); + } catch (JSiteException jse1) { + logger.log(Level.WARNING, "error in backend", jse1); } catch (IOException e) { /* ignore exception, disconnects are handled elsewhere. */ } @@ -241,11 +297,15 @@ public class RequestManager implements NodeListener, HighLevelProgressListener { * {@inheritDoc} */ public void nodeDisconnected(Node node, Throwable throwable) { - HighLevelClient highLevelClient = nodeManager.getHighLevelClient(node); - if (highLevelClient == null) { - logger.warning("got nodeDisconnected from node without high-level client: " + node); + Map identifierRequests = nodeRequests.get(node); + if (identifierRequests == null) { + logger.warning("got node without request map: " + node); return; } + for (Request request : identifierRequests.values()) { + fireRequestRemoved(request); + } + identifierRequests.clear(); } // @@ -253,11 +313,46 @@ public class RequestManager implements NodeListener, HighLevelProgressListener { // /** - * @see net.pterodactylus.fcp.highlevel.HighLevelProgressListener#progressReceived(java.lang.String, - * net.pterodactylus.fcp.highlevel.HighLevelProgress) + * @see net.pterodactylus.fcp.highlevel.HighLevelProgressListener#progressReceived(HighLevelClient, + * String, HighLevelProgress) */ - public void progressReceived(String identifier, HighLevelProgress highLevelProgress) { - fireRequestProgressed(null, new Request(identifier), highLevelProgress.getTotalBlocks(), highLevelProgress.getRequiredBlocks(), highLevelProgress.getSuccessfulBlocks(), highLevelProgress.getFailedBlocks(), highLevelProgress.getFatallyFailedBlocks(), highLevelProgress.isTotalFinalized()); + public void progressReceived(HighLevelClient highLevelClient, String identifier, HighLevelProgress highLevelProgress) { + Node node = nodeManager.getNode(highLevelClient); + if (node == null) { + logger.warning("got high-level client without node: " + highLevelClient); + return; + } + Map identifierRequests = nodeRequests.get(node); + if (identifierRequests == null) { + logger.warning("got node without request map: " + node); + identifierRequests = Collections.synchronizedMap(new HashMap()); + nodeRequests.put(node, identifierRequests); + } + Request request = identifierRequests.get(identifier); + if (request == null) { + logger.warning("got progress for unknown request: " + identifier); + request = new Request(node, identifier); + identifierRequests.put(identifier, request); + fireRequestAdded(request); + } + if (highLevelProgress.isFinished()) { + request.setFinished(true); + request.setSuccessful(!highLevelProgress.isFailed()); + fireRequestFinished(request); + } else if (highLevelProgress.isFetchable()) { + /* TODO - ignore? */ + } else if (highLevelProgress.getURI() != null) { + request.setURI(highLevelProgress.getURI()); + fireRequestGeneratedURI(request, highLevelProgress.getURI()); + } else { + request.setTotalBlocks(highLevelProgress.getTotalBlocks()); + request.setRequiredBlocks(highLevelProgress.getRequiredBlocks()); + request.setSuccessfulBlocks(highLevelProgress.getSuccessfulBlocks()); + request.setFailedBlocks(highLevelProgress.getFailedBlocks()); + request.setFatallyFailedBlocks(highLevelProgress.getFatallyFailedBlocks()); + request.setTotalFinalized(highLevelProgress.isTotalFinalized()); + fireRequestProgressed(request); + } } }