diff --git a/src/main/java/DownloadWorker.java b/src/main/java/DownloadWorker.java index 546de2d..c702b4a 100644 --- a/src/main/java/DownloadWorker.java +++ b/src/main/java/DownloadWorker.java @@ -21,23 +21,32 @@ public class DownloadWorker implements Runnable { @Override public void run() { - // TODO: Record the chunk start time in chunkStatus. + chunkStatus.setStartTimeMs(System.currentTimeMillis()); + double downloaded = 0.0; - // TODO: Print a message that this chunk has started downloading. + System.out.println("[Worker] Start downloading for " + chunkStatus.getChunkId()); while (downloaded < chunkStatus.getChunkSizeMB()) { - // TODO: Generate a random sleep delay between min and max delay. - // TODO: Sleep for that delay. - // TODO: Generate a random download amount for this step. - // TODO: Increase downloaded, but do not go beyond chunk size. - // TODO: Save the updated downloaded value into chunkStatus. - // TODO: Optionally print step-by-step progress. + long sleepTime = (long) config.getMinStepDelayMs() + (long) (random.nextDouble() * (config.getMaxStepDelayMs() - config.getMinStepDelayMs())); + + try { + Thread.sleep(sleepTime); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + break; + } + double stepSize = config.getMinStepDownloadMB() + (random.nextDouble() * (config.getMaxStepDownloadMB() - config.getMinStepDownloadMB())); + + downloaded += stepSize; + + if (downloaded > chunkStatus.getChunkSizeMB()) downloaded = chunkStatus.getChunkSizeMB(); + + chunkStatus.setDownloadedMB(downloaded); + System.out.println("Chunk " + chunkStatus.getChunkId() + " progress: " + downloaded + "/" + chunkStatus.getChunkSizeMB()); } - - // TODO: Mark the chunk as completed. - // TODO: Record the chunk end time in chunkStatus. - // TODO: Print a message that this chunk has finished downloading. + chunkStatus.setCompleted(true); + chunkStatus.setEndTimeMs(System.currentTimeMillis()); + System.out.println("[Worker] Finished download for " + chunkStatus.getChunkId()); } - } diff --git a/src/main/java/Main.java b/src/main/java/Main.java index 82bd239..7f790be 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -5,7 +5,6 @@ public class Main { public static void main(String[] args) { System.out.println("=== Simulated Download Manager ==="); - // 1. Read config DownloadConfig config; try { config = ConfigReader.readConfig("download_config.txt"); @@ -19,13 +18,11 @@ public class Main { System.out.println("Chunk count: " + config.getChunkCount()); System.out.println(); - // 2. Create chunks List chunks = ChunkUtils.createChunks( config.getTotalSizeMB(), config.getChunkCount() ); - // 3. Create worker threads List workerThreads = new ArrayList<>(); for (ChunkStatus chunk : chunks) { @@ -34,50 +31,38 @@ public class Main { workerThreads.add(workerThread); - // TODO: - // Students may print helpful debug information here, - // for example which chunk is assigned to which worker thread. + System.out.println("[Main] Assigned chunk ID " + chunk.getChunkId() + + " (Size: " + chunk.getChunkSizeMB() + " MB) to " + workerThread.getName()); } - // 4. Create and start monitor thread ProgressMonitor monitor = new ProgressMonitor(config, chunks); Thread monitorThread = new Thread(monitor, "Progress-Monitor"); - // TODO: - // Start the monitor thread before starting the workers - // so that progress can be displayed while downloading happens. - // - // Example idea: - // monitorThread.start(); + monitorThread.start(); + System.out.println("[Main] Monitor thread started"); - // 5. Start worker threads - // TODO: - // Start each worker thread in workerThreads. - // Use a loop and call start() on each thread. + for (Thread workerThread : workerThreads) { + workerThread.start(); + } + System.out.println("[Main] All worker threads started."); - // 6. Wait for workers to finish - // TODO: - // Wait for all worker threads to complete by calling join(). - // This should be done inside a try-catch block for InterruptedException. - // - // Hint: - // for (Thread thread : workerThreads) { - // thread.join(); - // } + try { + for (Thread thread : workerThreads) { + thread.join(); + } + System.out.println("[Main] All workers finished."); + } catch (InterruptedException e) { + System.out.println("[Main] Main thread interrupted while waiting for workers."); + Thread.currentThread().interrupt(); + } - // TODO: - // After all workers finish, the monitor thread may also need to stop. - // Depending on how ProgressMonitor is implemented, students may: - // - wait for it to finish on its own, or - // - add a stopping mechanism in ProgressMonitor later. - // - // If your monitor finishes automatically, you may join it here. + try { + monitorThread.join(); + System.out.println("[Main] Monitor finished."); + } catch (InterruptedException e) { + System.out.println("[Main] Main thread interrupted while waiting for monitor."); + } - // NOTE: - // this final report may show 0 progress because no worker has actually run yet. - // Until students complete the thread start/join TODOs above, - - // 7. Print final report System.out.println(); System.out.println("=== Final Report ==="); diff --git a/src/main/java/ProgressMonitor.java b/src/main/java/ProgressMonitor.java index 475c0e0..9980e3d 100644 --- a/src/main/java/ProgressMonitor.java +++ b/src/main/java/ProgressMonitor.java @@ -16,16 +16,7 @@ public class ProgressMonitor implements Runnable { @Override public void run() { - // TODO: - // Repeatedly check chunk progress until all chunks are completed. - // In each loop: - // 1. Read the downloaded size from every chunk - // 2. Add all downloaded amounts to totalDownloadedMB - // 3. Count completed chunks - // 4. Print a progress message - // 5. If completedChunks == chunks.size(), print a final monitor message and stop - // 6. Otherwise sleep for monitorDelayMs and continue - + System.out.println("[Monitor] Started monitoring progress..."); while (true) { double totalDownloadedMB = 0.0; @@ -54,9 +45,11 @@ public class ProgressMonitor implements Runnable { chunks.size() ); - - // TODO: - // If all chunks are completed, print a final message and exit the loop + if (completedChunks == chunks.size()) + { + System.out.println("[Monitor] All chunks downloaded successfully!"); + break; + } try { Thread.sleep(monitorDelayMs);