Skip to content

Commit cb492c6

Browse files
CypherPotatoCypherPotato
authored
Merge branch 'master' into master
2 parents c72edf3 + 0c959df commit cb492c6

File tree

1,787 files changed

+46236
-26240
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,787 files changed

+46236
-26240
lines changed

‎CODE_OF_CONDUCT.md

Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
1+
2+
# Contributor Covenant Code of Conduct
3+
4+
## Our Pledge
5+
6+
We as members, contributors, and leaders pledge to make participation in our
7+
community a harassment-free experience for everyone, regardless of age, body
8+
size, visible or invisible disability, ethnicity, sex characteristics, gender
9+
identity and expression, level of experience, education, socio-economic status,
10+
nationality, personal appearance, race, caste, color, religion, or sexual
11+
identity and orientation.
12+
13+
We pledge to act and interact in ways that contribute to an open, welcoming,
14+
diverse, inclusive, and healthy community.
15+
16+
## Our Standards
17+
18+
Examples of behavior that contributes to a positive environment for our
19+
community include:
20+
21+
* Demonstrating empathy and kindness toward other people
22+
* Being respectful of differing opinions, viewpoints, and experiences
23+
* Giving and gracefully accepting constructive feedback
24+
* Accepting responsibility and apologizing to those affected by our mistakes,
25+
and learning from the experience
26+
* Focusing on what is best not just for us as individuals, but for the overall
27+
community
28+
29+
Examples of unacceptable behavior include:
30+
31+
* The use of sexualized language or imagery, and sexual attention or advances of
32+
any kind
33+
* Trolling, insulting or derogatory comments, and personal or political attacks
34+
* Public or private harassment
35+
* Publishing others' private information, such as a physical or email address,
36+
without their explicit permission
37+
* Other conduct which could reasonably be considered inappropriate in a
38+
professional setting
39+
40+
## Enforcement Responsibilities
41+
42+
Community leaders are responsible for clarifying and enforcing our standards of
43+
acceptable behavior and will take appropriate and fair corrective action in
44+
response to any behavior that they deem inappropriate, threatening, offensive,
45+
or harmful.
46+
47+
Community leaders have the right and responsibility to remove, edit, or reject
48+
comments, commits, code, wiki edits, issues, and other contributions that are
49+
not aligned to this Code of Conduct, and will communicate reasons for moderation
50+
decisions when appropriate.
51+
52+
## Scope
53+
54+
This Code of Conduct applies within all community spaces, and also applies when
55+
an individual is officially representing the community in public spaces.
56+
Examples of representing our community include using an official email address,
57+
posting via an official social media account, or acting as an appointed
58+
representative at an online or offline event.
59+
60+
## Enforcement
61+
62+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
63+
reported to the community leaders responsible for enforcement at
64+
[email protected].
65+
All complaints will be reviewed and investigated promptly and fairly.
66+
67+
All community leaders are obligated to respect the privacy and security of the
68+
reporter of any incident.
69+
70+
## Enforcement Guidelines
71+
72+
Community leaders will follow these Community Impact Guidelines in determining
73+
the consequences for any action they deem in violation of this Code of Conduct:
74+
75+
### 1. Correction
76+
77+
**Community Impact**: Use of inappropriate language or other behavior deemed
78+
unprofessional or unwelcome in the community.
79+
80+
**Consequence**: A private, written warning from community leaders, providing
81+
clarity around the nature of the violation and an explanation of why the
82+
behavior was inappropriate. A public apology may be requested.
83+
84+
### 2. Warning
85+
86+
**Community Impact**: A violation through a single incident or series of
87+
actions.
88+
89+
**Consequence**: A warning with consequences for continued behavior. No
90+
interaction with the people involved, including unsolicited interaction with
91+
those enforcing the Code of Conduct, for a specified period of time. This
92+
includes avoiding interactions in community spaces as well as external channels
93+
like social media. Violating these terms may lead to a temporary or permanent
94+
ban.
95+
96+
### 3. Temporary Ban
97+
98+
**Community Impact**: A serious violation of community standards, including
99+
sustained inappropriate behavior.
100+
101+
**Consequence**: A temporary ban from any sort of interaction or public
102+
communication with the community for a specified period of time. No public or
103+
private interaction with the people involved, including unsolicited interaction
104+
with those enforcing the Code of Conduct, is allowed during this period.
105+
Violating these terms may lead to a permanent ban.
106+
107+
### 4. Permanent Ban
108+
109+
**Community Impact**: Demonstrating a pattern of violation of community
110+
standards, including sustained inappropriate behavior, harassment of an
111+
individual, or aggression toward or disparagement of classes of individuals.
112+
113+
**Consequence**: A permanent ban from any sort of public interaction within the
114+
community.
115+
116+
## Attribution
117+
118+
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
119+
version 2.1, available at
120+
[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
121+
122+
Community Impact Guidelines were inspired by
123+
[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
124+
125+
For answers to common questions about this code of conduct, see the FAQ at
126+
[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
127+
[https://www.contributor-covenant.org/translations][translations].
128+
129+
[homepage]: https://www.contributor-covenant.org
130+
[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
131+
[Mozilla CoC]: https://github.com/mozilla/diversity
132+
[FAQ]: https://www.contributor-covenant.org/faq
133+
[translations]: https://www.contributor-covenant.org/translations

‎Dockerfile

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:24.04
22

33
ARG DEBIAN_FRONTEND=noninteractive
44
# WARNING: DON'T PUT A SPACE AFTER ANY BACKSLASH OR APT WILL BREAK
@@ -18,24 +18,25 @@ RUN apt-get -yqq update && \
1818
libpq-dev \
1919
pkg-config \
2020
python3 \
21+
python3-colorama \
2122
python3-dev \
23+
python3-dnspython \
24+
python3-packaging \
2225
python3-pip \
26+
python3-psutil \
27+
python3-psycopg2 \
28+
python3-requests \
2329
siege \
24-
software-properties-common
25-
26-
RUN pip3 install \
27-
colorama==0.3.1 \
28-
docker==4.0.2 \
29-
mysqlclient \
30-
psutil \
31-
psycopg2-binary \
32-
pymongo==3.13.0 \
33-
# urllib3 incompatibility:
34-
# https://github.com/docker/docker-py/issues/3113#issuecomment-1525500104
35-
requests==2.28.1
30+
software-properties-common && \
31+
# Ubuntu's equivalent packages are too old and/or broken.
32+
pip3 install \
33+
--break-system-packages \
34+
docker==7.0.0 \
35+
mysqlclient==2.2.4 \
36+
pymongo==4.7.2
3637

3738
# Collect resource usage statistics
38-
ARG DOOL_VERSION=v1.2.0
39+
ARG DOOL_VERSION=v1.3.1
3940

4041
WORKDIR /tmp
4142
RUN curl -LSs "https://github.com/scottchiefbaker/dool/archive/${DOOL_VERSION}.tar.gz" | \

‎frameworks/C++/libsniper/libs/core

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Subproject commit a792ecfebb02f98bbdd8db232fba69f3f92907b3

‎frameworks/C++/paozhu/paozhu.dockerfile

Lines changed: 80 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:24.04
22
RUN apt-get update -yqq && apt-get install -yqq apt-utils software-properties-common wget unzip cmake git
33
RUN apt-get install -yqq gcc g++ openssl libssl-dev zlib1g-dev build-essential locales
44

@@ -18,24 +18,95 @@ WORKDIR /
1818
# RUN wget https://github.com/hggq/paozhu/releases/download/v1.5.8/benchmark.zip
1919
RUN git clone https://github.com/hggq/paozhu
2020
# RUN unzip benchmark.zip
21-
RUN rm -Rf ./paozhu/controller
22-
23-
COPY ./paozhu_benchmark/controller ./paozhu/
24-
COPY ./paozhu_benchmark/common/autocontrolmethod.hpp ./paozhu/common/
25-
COPY ./paozhu_benchmark/common/reghttpmethod_pre.hpp ./paozhu/common/
26-
COPY ./paozhu_benchmark/common/reghttpmethod.hpp ./paozhu/common/
21+
# RUN rm -Rf ./paozhu/controller
22+
# RUN rm -Rf ./paozhu/libs
23+
# RUN rm -Rf ./paozhu/view
24+
# RUN rm -Rf ./paozhu/viewsrc
25+
# RUN rm -Rf ./paozhu/orm
26+
# RUN rm -Rf ./paozhu/models
27+
# RUN rm -Rf ./paozhu/common
28+
29+
30+
31+
# COPY ./paozhu_benchmark/controller ./paozhu/
32+
# COPY ./paozhu_benchmark/libs ./paozhu/
33+
# COPY ./paozhu_benchmark/view ./paozhu/
34+
# COPY ./paozhu_benchmark/viewsrc ./paozhu/
35+
36+
# COPY ./paozhu_benchmark/orm ./paozhu/
37+
# COPY ./paozhu_benchmark/models ./paozhu/
38+
# COPY ./paozhu_benchmark/common ./paozhu/
39+
40+
# RUN ls -l ./paozhu
41+
# RUN pwd
42+
# RUN mkdir ./paozhu/common
43+
# RUN mkdir ./paozhu/libs
44+
# RUN mkdir ./paozhu/libs/types
45+
# COPY ./paozhu_benchmark/libs/types/techempower_json.h ./paozhu/libs/types/
46+
# COPY ./paozhu_benchmark/libs/types/techempower_json_jsonreflect.cpp ./paozhu/libs/types/
47+
48+
# RUN mkdir ./paozhu/controller
49+
# RUN mkdir ./paozhu/controller/include
50+
# RUN mkdir ./paozhu/controller/src
51+
52+
# COPY ./paozhu_benchmark/controller/include/techempower.h ./paozhu/controller/include/
53+
# COPY ./paozhu_benchmark/controller/src/techempower.cpp ./paozhu/controller/src/
54+
55+
56+
# COPY ./paozhu_benchmark/common/autocontrolmethod.hpp ./paozhu/common/
57+
# COPY ./paozhu_benchmark/common/reghttpmethod_pre.hpp ./paozhu/common/
58+
# COPY ./paozhu_benchmark/common/reghttpmethod.hpp ./paozhu/common/
59+
# COPY ./paozhu_benchmark/common/json_reflect_headers.h ./paozhu/common/
60+
61+
# COPY ./paozhu_benchmark/common/cost_define.h ./paozhu/common/
62+
# COPY ./paozhu_benchmark/common/autorestfulpaths.hpp ./paozhu/common/
63+
# COPY ./paozhu_benchmark/common/websockets_method_reg.hpp ./paozhu/common/
64+
# COPY ./paozhu_benchmark/common/httphook.cpp ./paozhu/common/
2765

2866
COPY ./paozhu_benchmark/conf/server.conf ./paozhu/conf/server.conf
2967
COPY ./paozhu_benchmark/conf/orm.conf ./paozhu/conf/orm.conf
68+
69+
# must use testbenchmark.cpp to test benchmark
3070
COPY ./paozhu_benchmark/CMakeLists.txt ./paozhu/CMakeLists.txt
3171

72+
# RUN mkdir ./paozhu/view
73+
# RUN mkdir ./paozhu/view/techempower
74+
75+
# COPY ./paozhu_benchmark/view/techempower/fortunes.html ./paozhu/view/techempower/
76+
77+
# RUN mkdir ./paozhu/viewsrc
78+
# RUN mkdir ./paozhu/viewsrc/include
79+
# RUN mkdir ./paozhu/viewsrc/view
80+
# RUN mkdir ./paozhu/viewsrc/view/techempower
81+
82+
# COPY ./paozhu_benchmark/viewsrc/view/techempower/fortunes.cpp ./paozhu/viewsrc/view/techempower/
83+
# COPY ./paozhu_benchmark/viewsrc/include/viewsrc.h ./paozhu/viewsrc/include/
84+
# COPY ./paozhu_benchmark/viewsrc/include/regviewmethod.hpp ./paozhu/viewsrc/include/
85+
86+
87+
88+
# RUN mkdir ./paozhu/orm
89+
# RUN mkdir ./paozhu/orm/include
90+
91+
92+
# COPY ./paozhu_benchmark/orm/orm.h ./paozhu/orm/
93+
# COPY ./paozhu_benchmark/orm/include/fortunebase.h ./paozhu/orm/include/
94+
# COPY ./paozhu_benchmark/orm/include/worldbase.h ./paozhu/orm/include/
95+
96+
# RUN mkdir ./paozhu/models
97+
# RUN mkdir ./paozhu/models/include
98+
99+
# COPY ./paozhu_benchmark/models/include/Fortune.h ./paozhu/models/include/
100+
# COPY ./paozhu_benchmark/models/include/World.h ./paozhu/models/include/
101+
# COPY ./paozhu_benchmark/models/World.cpp ./paozhu/models/
102+
# COPY ./paozhu_benchmark/models/Fortune.cpp ./paozhu/models/
103+
32104
WORKDIR /paozhu
33105
RUN unzip asio.zip
34106

35107
RUN cmake . -B build -DCMAKE_BUILD_TYPE=Release
36108
RUN cmake --build build
37109

38-
39110
EXPOSE 8888
40111

41-
CMD ./bin/paozhu
112+
CMD ./bin/paozhu

0 commit comments

Comments
 (0)