Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion scripts/source-dependencies.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
"tcp": ["ds"],
"threading": [],
"tls": ["crypto", "ds"],
"udp": ["ds"]
"udp": ["ds"],
"uv": []
}
}
2 changes: 1 addition & 1 deletion src/host/after_io.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the Apache 2.0 License.
#pragma once

#include "proxy.h"
#include "uv/proxy.h"

namespace asynchost
{
Expand Down
2 changes: 1 addition & 1 deletion src/host/before_io.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#pragma once

#include "ds/internal_logger.h"
#include "proxy.h"
#include "uv/proxy.h"

namespace asynchost
{
Expand Down
2 changes: 1 addition & 1 deletion src/host/every_io.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the Apache 2.0 License.
#pragma once

#include "proxy.h"
#include "uv/proxy.h"

namespace asynchost
{
Expand Down
2 changes: 1 addition & 1 deletion src/host/signal.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the Apache 2.0 License.
#pragma once

#include "proxy.h"
#include "uv/proxy.h"

#include <chrono>

Expand Down
2 changes: 1 addition & 1 deletion src/host/tcp.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
#include "dns.h"
#include "ds/internal_logger.h"
#include "ds/pending_io.h"
#include "proxy.h"
#include "socket.h"
#include "uv/proxy.h"

#include <netinet/in.h>
#include <optional>
Expand Down
2 changes: 1 addition & 1 deletion src/host/timer.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the Apache 2.0 License.
#pragma once

#include "proxy.h"
#include "uv/proxy.h"

#include <chrono>

Expand Down
2 changes: 1 addition & 1 deletion src/host/udp.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
#include "dns.h"
#include "ds/internal_logger.h"
#include "ds/pending_io.h"
#include "proxy.h"
#include "socket.h"
#include "uv/proxy.h"

#include <optional>

Expand Down
2 changes: 1 addition & 1 deletion src/http/curl.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "ccf/http_configuration.h"
#include "ccf/rest_verb.h"
#include "ds/internal_logger.h"
#include "host/proxy.h"
#include "uv/proxy.h"

#include <cstddef>
#include <cstdint>
Expand Down
2 changes: 2 additions & 0 deletions src/host/proxy.h → src/uv/proxy.h

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Splitting namespaces across "components" (folders) is going to get really confusing. host contained both all of ccf::asynchost, and bits of the actual cchost top-level entry point. I think if we're moving this, we need to re-namespace it as well. And we should consider moving more of the UV lifetime wrapper stuff (all the headers currently under host/ which this PR touches), if we're creating a distinct "UV wrapper" component, and its safe (dependency-wise) to do so.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed, let's re-namespace? I'm deliberately keeping the changes to a minimum as I break the cycles, because expanding the scope has a tendency to make things harder, but happy to try.

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
// Licensed under the Apache 2.0 License.
#pragma once

#include <cstddef>
#include <memory>
#include <utility>
#include <uv.h>

namespace asynchost
Expand Down