From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Cc: John 'Warthog9' Hawley <warthog9@kernel.org>,
Petr Baudis <pasky@suse.cz>, Fredrik Kuivinen <frekui@gmail.com>,
Giuseppe Bilotta <giuseppe.bilotta@gmail.com>,
Luben Tuikov <ltuikov@yahoo.com>,
Martin Koegler <mkoegler@auto.tuwien.ac.at>,
Jakub Narebski <jnareb@gmail.com>
Subject: [PATCH 1/3] gitweb.js: No need for inProgress in blame_incremental.js
Date: Fri, 27 May 2011 15:49:59 +0200 [thread overview]
Message-ID: <1306504201-18014-2-git-send-email-jnareb@gmail.com> (raw)
In-Reply-To: <1306504201-18014-1-git-send-email-jnareb@gmail.com>
JavaScript is single-threaded, so there is no need for protection
against re-entrancy via inProgress variable.
In particular calls to setInterval handler are stacked if handler
doesn't finish before new interrupt (before new interval). The same
happens with events - they are (hopefully) stacked if even handler
didn't finish work.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
---
Remove and simplify code.
gitweb/static/js/blame_incremental.js | 21 +++------------------
1 files changed, 3 insertions(+), 18 deletions(-)
diff --git a/gitweb/static/js/blame_incremental.js b/gitweb/static/js/blame_incremental.js
index 676da6b..4841805 100644
--- a/gitweb/static/js/blame_incremental.js
+++ b/gitweb/static/js/blame_incremental.js
@@ -420,8 +420,6 @@ function handleLine(commit, group) {
// ----------------------------------------------------------------------
-var inProgress = false; // are we processing response
-
/**#@+
* @constant
*/
@@ -536,7 +534,7 @@ function processData(unprocessed, nextReadPos) {
*
* @param {XMLHttpRequest} xhr: XMLHttpRequest object
*
- * @globals pollTimer, commits, inProgress
+ * @globals pollTimer, commits
*/
function handleError(xhr) {
errorInfo('Server error: ' +
@@ -544,8 +542,6 @@ function handleError(xhr) {
clearInterval(pollTimer);
commits = {}; // free memory
-
- inProgress = false;
}
/**
@@ -553,7 +549,7 @@ function handleError(xhr) {
*
* @param {XMLHttpRequest} xhr: XMLHttpRequest object (unused)
*
- * @globals pollTimer, commits, inProgress
+ * @globals pollTimer, commits
*/
function responseLoaded(xhr) {
clearInterval(pollTimer);
@@ -561,15 +557,13 @@ function responseLoaded(xhr) {
fixColorsAndGroups();
writeTimeInterval();
commits = {}; // free memory
-
- inProgress = false;
}
/**
* handler for XMLHttpRequest onreadystatechange event
* @see startBlame
*
- * @globals xhr, inProgress
+ * @globals xhr
*/
function handleResponse() {
@@ -609,13 +603,6 @@ function handleResponse() {
return;
}
- // in case we were called before finished processing
- if (inProgress) {
- return;
- } else {
- inProgress = true;
- }
-
// extract new whole (complete) lines, and process them
while (xhr.prevDataLength !== xhr.responseText.length) {
if (xhr.readyState === 4 &&
@@ -633,8 +620,6 @@ function handleResponse() {
xhr.prevDataLength === xhr.responseText.length) {
responseLoaded(xhr);
}
-
- inProgress = false;
}
// ============================================================
--
1.7.5
next prev parent reply other threads:[~2011-05-27 13:50 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-27 13:49 [PATCH 0/3] gitweb: Improving blame_incremental.js Jakub Narebski
2011-05-27 13:49 ` Jakub Narebski [this message]
2011-05-27 13:50 ` [PATCH 2/3] gitweb.js: No need for loop in blame_incremental's handleResponse() Jakub Narebski
2011-05-27 13:50 ` [PATCH 3/3] gitweb.js: use setTimeout rather than setInterval in blame_incremental.js Jakub Narebski
2011-05-27 14:04 ` [PATCH 0/3] gitweb: Improving blame_incremental.js Jakub Narebski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1306504201-18014-2-git-send-email-jnareb@gmail.com \
--to=jnareb@gmail.com \
--cc=frekui@gmail.com \
--cc=git@vger.kernel.org \
--cc=giuseppe.bilotta@gmail.com \
--cc=ltuikov@yahoo.com \
--cc=mkoegler@auto.tuwien.ac.at \
--cc=pasky@suse.cz \
--cc=warthog9@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).