dblsaiko/pijul - Change 4HTHYIA3GLMUBUMAI7CQMZA4KE47EUXOP24XLUEYFRMOG57CJLMAC

Fixing HTTP download

Created by pmeunier on March 1, 2023

4HTHYIA3GLMUBUMAI7CQMZA4KE47EUXOP24XLUEYFRMOG57CJLMAC

Dependencies

In channels

main

Change contents

Insertion in pijul/src/remote/mod.rs at line 1165 [6.52474]
[4.77]
[5.231]
```
        let mut asked = HashSet::new();
```
Insertion in pijul/src/remote/mod.rs at line 1176 [6.52474]
[5.454]
[4.119]
```
            asked.insert(*h);
```

Replacement in pijul/src/remote/mod.rs at line 1183 [6.52474]

B:BD[4.200] → [4.200:285]

            .download_changes_rec(repo, hash_send, recv, send_ready, pro_a, waiting)

[4.200]

[7.237]

            .download_changes_rec(repo, hash_send, recv, send_ready, pro_a, waiting, asked)

Insertion in pijul/src/remote/mod.rs at line 1253 [6.52474]
[7.850]
[4.393]
```
        mut asked: HashSet<CS>,
```

Insertion in pijul/src/remote/mod.rs at line 1264 [6.52474]

[7.1407]

                debug!("received {:?} {:?}", hash, follow);

Replacement in pijul/src/remote/mod.rs at line 1282 [6.52474]

B:BD[7.2403] → [7.2403:2514]

                                send_hash.send(CS::Change(dep))?;
                                waiting += 1

[7.2403]

[7.2514]

                                if asked.insert(CS::Change(dep)) {
                                    send_hash.send(CS::Change(dep))?;
                                    waiting += 1
                                }

Insertion in pijul/src/remote/mod.rs at line 1303 [6.52474]
[7.3116]
[7.3116]
```
            info!("waiting loop done");
```
Insertion in pijul/src/remote/mod.rs at line 1346 [6.52474]
[8.345]
[6.71943]
```
        let mut asked = HashSet::new();
```
Insertion in pijul/src/remote/mod.rs at line 1350 [6.52474]
[9.17706]
[6.72012]
```
            asked.insert(CS::Change(h));
```

Replacement in pijul/src/remote/mod.rs at line 1356 [6.52474]

B:BD[4.593] → [4.593:685]

            .download_changes_rec(repo, send_hash, recv_signal, send_ready, pro_n, waiting)

[4.593]

[7.3566]

            .download_changes_rec(repo, send_hash, recv_signal, send_ready, pro_n, waiting, asked)

Insertion in pijul/src/remote/http.rs at line 50 [11.10]
[2.38]
[10.213]
```
        debug!("waiting chunk {:?}", c);
```
Insertion in pijul/src/remote/http.rs at line 61 [11.10]
[10.596]
[10.596]
```
            debug!("waiting chunk {:?}", c);
```
Insertion in pijul/src/remote/http.rs at line 63 [11.10]
[10.606]
[2.39]
```
        debug!("done chunk {:?}", c);
```
Insertion in pijul/src/remote/http.rs at line 126 [11.10]
[10.1304]
[10.1304]
```
    debug!("renaming {:?} {:?}", c, done);
```
Insertion in pijul/src/remote/http.rs at line 137 [11.10]
[10.1391]
[12.856]
```
    debug!("download_change returning {:?}", c);
```

Replacement in pijul/src/remote/http.rs at line 152 [11.10]

B:BD[13.981] → [14.1461:1513]

        let mut pool = <[_; POOL_SIZE]>::default();

[15.1338]

[14.1513]

        debug!("starting download_changes http");
        let mut pool: [Option<tokio::task::JoinHandle<Result<CS, _>>>; POOL_SIZE] =
            <[_; POOL_SIZE]>::default();

Replacement in pijul/src/remote/http.rs at line 156 [11.10]

B:BD[14.1538] → [16.3222:3272]

∅:D[16.3308] → [17.322:365]

B:BD[11.458] → [17.322:365]

B:BD[18.1395] → [14.1539:1740]

B:BD[14.1740] → [3.2291:2333]

∅:D[3.2333] → [14.1740:1774]

B:BD[14.1740] → [14.1740:1774]

B:BD[14.1774] → [16.3309:3332]

∅:D[16.3332] → [14.1798:1867]

B:BD[14.1798] → [14.1798:1867]

        while let Some(c) = hashes.recv().await {
            debug!("downloading {:?}", c);
            let t = std::mem::replace(
                &mut pool[cur],
                Some(tokio::spawn(download_change(
                    self.client.clone(),
                    self.url.clone(),
                    self.headers.clone(),
                    path.clone(),
                    c,
                ))),
            );
            if let Some(t) = t {

[14.1538]

[19.4977]

        loop {
            if let Some(t) = pool[cur].take() {

Replacement in pijul/src/remote/http.rs at line 159 [11.10]

∅:D[19.5034] → [12.867:902]

B:BD[14.1867] → [12.867:902]

B:BD[12.902] → [19.5035:5078]

                let c = t.await??;
                debug!("sending {:?}", c);

[19.5034]

[20.2950]

                let c_ = t.await.unwrap().unwrap();
                debug!("sending {:?}", c_);

Replacement in pijul/src/remote/http.rs at line 162 [11.10]

B:BD[20.3019] → [8.1650:1707]

∅:D[12.951] → [14.1944:1991]

∅:D[8.1707] → [14.1944:1991]

B:BD[14.1944] → [14.1944:1991]

                if send.send((c, true)).await.is_err() {
                    debug!("err for {:?}", c);

[20.3019]

[14.2031]

                if send.send((c_, true)).await.is_err() {
                    debug!("err for {:?}", c_);

Replacement in pijul/src/remote/http.rs at line 166 [11.10]

B:BD[14.2076] → [19.5139:5171]

                debug!("sent");

[14.2076]

[11.1335]

                debug!("sent {:?}", c_);
                continue
            }
            let mut next = cur;
            for i in 1..POOL_SIZE {
                if pool[(cur + i) % POOL_SIZE].is_some() {
                    next = (cur + i) % POOL_SIZE;
                    break
                }

Replacement in pijul/src/remote/http.rs at line 176 [11.10]

B:BD[11.1349] → [14.2077:2118]

B:BD[14.2118] → [21.96:239]

B:BD[21.239] → [19.5172:5215]

B:BD[19.5215] → [20.3020:3089]

B:BD[20.3089] → [8.1708:1765]

∅:D[8.1765] → [21.288:335]

B:BD[21.288] → [21.288:335]

            cur = (cur + 1) % POOL_SIZE;
        }
        for f in 0..POOL_SIZE {
            if let Some(t) = pool[(cur + f) % POOL_SIZE].take() {
                let c = t.await??;
                debug!("sending {:?}", c);
                super::PROGRESS.borrow_mut().unwrap()[pro_n].incr();
                if send.send((c, true)).await.is_err() {
                    debug!("err for {:?}", c);

[11.1349]

[21.375]

            if next == cur {
                if let Some(c) = hashes.recv().await {
                    debug!("downloading on process {:?}: {:?}", cur, c);
                    pool[cur] = Some(tokio::spawn(download_change(
                        self.client.clone(),
                        self.url.clone(),
                        self.headers.clone(),
                        path.clone(),
                        c,
                    )));
                    cur = (cur + 1) % POOL_SIZE;
                } else {

Replacement in pijul/src/remote/http.rs at line 190 [11.10]

B:BD[21.420] → [19.5276:5308]

                debug!("sent");

[21.420]

            } else {
                tokio::select! {
                    c = hashes.recv() => {
                        if let Some(c) = c {
                            debug!("downloading on process {:?}: {:?}", cur, c);
                            pool[cur] = Some(tokio::spawn(download_change(
                                self.client.clone(),
                                self.url.clone(),
                                self.headers.clone(),
                                path.clone(),
                                c,
                            )));
                            cur = (cur + 1) % POOL_SIZE;
                        } else {
                            break;
                        }
                    }
                    c = pool[next].as_mut().unwrap() => {
                        pool[next] = None;
                        let c = c??;
                        super::PROGRESS.borrow_mut().unwrap()[pro_n].incr();
                        if send.send((c, true)).await.is_err() {
                            debug!("err for {:?}", c);
                            break;
                        }
                    }
                }

Fixing HTTP download

Dependencies

In channels

Change contents

Insertion in pijul/src/remote/mod.rs at line 1165 [6.52474]

Insertion in pijul/src/remote/mod.rs at line 1176 [6.52474]

Replacement in pijul/src/remote/mod.rs at line 1183 [6.52474]

Insertion in pijul/src/remote/mod.rs at line 1253 [6.52474]

Insertion in pijul/src/remote/mod.rs at line 1264 [6.52474]

Replacement in pijul/src/remote/mod.rs at line 1282 [6.52474]

Insertion in pijul/src/remote/mod.rs at line 1303 [6.52474]

Insertion in pijul/src/remote/mod.rs at line 1346 [6.52474]

Insertion in pijul/src/remote/mod.rs at line 1350 [6.52474]

Replacement in pijul/src/remote/mod.rs at line 1356 [6.52474]

Insertion in pijul/src/remote/http.rs at line 50 [11.10]

Insertion in pijul/src/remote/http.rs at line 61 [11.10]

Insertion in pijul/src/remote/http.rs at line 63 [11.10]

Insertion in pijul/src/remote/http.rs at line 126 [11.10]

Insertion in pijul/src/remote/http.rs at line 137 [11.10]