Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

wip: allow parallel update of feeds

Browse Source
This commit is contained in:
Athou
2013-05-22 00:07:13 +02:00
parent f75baf5cff
commit 15b7d685fe
7 changed files with 177 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/com/commafeed/backend/feeds/FeedRefreshTaskGiver.java
View File

@@ -6,10 +6,8 @@ import java.util.List;
import java.util.Queue;
import javax.annotation.PostConstruct;
import javax.ejb.Lock;
import javax.ejb.LockType;
import javax.ejb.Singleton;
import javax.inject.Inject;
import javax.inject.Singleton;
import org.apache.commons.lang3.time.DateUtils;
@@ -34,7 +32,8 @@ public class FeedRefreshTaskGiver {
private int backgroundThreads;
private Queue<Feed> addQueue = Queues.newConcurrentLinkedQueue();
private Queue<Feed> queue = Queues.newConcurrentLinkedQueue();
private Queue<Feed> takeQueue = Queues.newConcurrentLinkedQueue();
private Queue<Feed> giveBackQueue = Queues.newConcurrentLinkedQueue();
@PostConstruct
public void init() {
@@ -42,7 +41,6 @@ public class FeedRefreshTaskGiver {
.getBackgroundThreads();
}
@Lock(LockType.WRITE)
public void add(Feed feed) {
Date now = Calendar.getInstance().getTime();
boolean heavyLoad = applicationSettingsService.get().isHeavyLoad();
@@ -52,31 +50,34 @@ public class FeedRefreshTaskGiver {
feed.setEtagHeader(null);
feed.setLastModifiedHeader(null);
}
addQueue.add(feed);
}
@Lock(LockType.WRITE)
public Feed take() {
Feed feed = queue.poll();
public synchronized Feed take() {
Feed feed = takeQueue.poll();
if (feed == null) {
int count = Math.min(100, 5 * backgroundThreads);
List<Feed> feeds = feedDAO.findNextUpdatable(count);
int addQueueSize = queue.size();
for (int i = 0; i < addQueueSize; i++) {
feeds.add(addQueue.poll());
}
feeds.addAll(addQueue);
for (Feed f : feeds) {
queue.add(f);
takeQueue.add(f);
f.setLastUpdated(Calendar.getInstance().getTime());
}
feeds.addAll(giveBackQueue);
feedDAO.update(feeds);
feed = queue.poll();
feed = takeQueue.poll();
}
metricsBean.feedRefreshed();
return feed;
}
public void giveBack(Feed feed) {
giveBackQueue.add(feed);
}
}