ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.212 by root, Tue Feb 13 19:25:44 2007 UTC vs.
Revision 1.259 by root, Sat Apr 21 17:46:39 2007 UTC

3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket;
8use Storable; 9use Storable;
10use Event;
9use Opcode; 11use Opcode;
10use Safe; 12use Safe;
11use Safe::Hole; 13use Safe::Hole;
12 14
13use Coro 3.5 (); 15use Coro 3.61 ();
16use Coro::State;
17use Coro::Handle;
14use Coro::Event; 18use Coro::Event;
15use Coro::Timer; 19use Coro::Timer;
16use Coro::Signal; 20use Coro::Signal;
17use Coro::Semaphore; 21use Coro::Semaphore;
18use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable;
19 24
20use BDB (); 25use BDB ();
21use Data::Dumper; 26use Data::Dumper;
22use Digest::MD5; 27use Digest::MD5;
23use Fcntl; 28use Fcntl;
29use YAML::Syck ();
24use IO::AIO 2.32 (); 30use IO::AIO 2.32 ();
25use YAML::Syck ();
26use Time::HiRes; 31use Time::HiRes;
27use Compress::LZF; 32use Compress::LZF;
28 33
34# configure various modules to our taste
35#
36$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
29Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
30 39
31use Event; $Event::Eval = 1; # no idea why this is required, but it is 40$Event::Eval = 1; # no idea why this is required, but it is
32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 41
35# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
36$YAML::Syck::ImplicitUnicode = 1; 43$YAML::Syck::ImplicitUnicode = 1;
37 44
38$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
39 48
40our %COMMAND = (); 49our %COMMAND = ();
41our %COMMAND_TIME = (); 50our %COMMAND_TIME = ();
42 51
43our @EXTS = (); # list of extension package names 52our @EXTS = (); # list of extension package names
44our %EXTCMD = (); 53our %EXTCMD = ();
45our %EXT_CORO = (); # coroutines bound to extensions 54our %EXT_CORO = (); # coroutines bound to extensions
46our %EXT_MAP = (); # pluggable maps 55our %EXT_MAP = (); # pluggable maps
47 56
57our $RELOAD; # number of reloads so far
48our @EVENT; 58our @EVENT;
49our $LIBDIR = datadir . "/ext";
50 59
51our $TICK = MAX_TIME * 1e-6; 60our $CONFDIR = confdir;
61our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db";
71
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
52our $TICK_WATCHER; 73our $TICK_WATCHER;
53our $AIO_POLL_WATCHER; 74our $AIO_POLL_WATCHER;
54our $WRITE_RUNTIME_WATCHER; 75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
55our $NEXT_TICK; 76our $NEXT_TICK;
56our $NOW; 77our $NOW;
57our $USE_FSYNC = 1; # use fsync to write maps - default off 78our $USE_FSYNC = 1; # use fsync to write maps - default off
58 79
59our $BDB_POLL_WATCHER; 80our $BDB_POLL_WATCHER;
65our $RUNTIME; 86our $RUNTIME;
66 87
67our %PLAYER; # all users 88our %PLAYER; # all users
68our %MAP; # all maps 89our %MAP; # all maps
69our $LINK_MAP; # the special {link} map, which is always available 90our $LINK_MAP; # the special {link} map, which is always available
70our $RANDOM_MAPS = cf::localdir . "/random";
71our $BDB_ENV_DIR = cf::localdir . "/db";
72
73our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
74our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
75 91
76# used to convert map paths into valid unix filenames by replacing / by ∕ 92# used to convert map paths into valid unix filenames by replacing / by ∕
77our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
78 94
79binmode STDOUT; 95binmode STDOUT;
80binmode STDERR; 96binmode STDERR;
81 97
82# read virtual server time, if available 98# read virtual server time, if available
83unless ($RUNTIME || !-e cf::localdir . "/runtime") { 99unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
84 open my $fh, "<", cf::localdir . "/runtime" 100 open my $fh, "<", "$LOCALDIR/runtime"
85 or die "unable to read runtime file: $!"; 101 or die "unable to read runtime file: $!";
86 $RUNTIME = <$fh> + 0.; 102 $RUNTIME = <$fh> + 0.;
87} 103}
88 104
89mkdir cf::localdir; 105mkdir $_
90mkdir cf::localdir . "/" . cf::playerdir; 106 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
91mkdir cf::localdir . "/" . cf::tmpdir;
92mkdir cf::localdir . "/" . cf::uniquedir;
93mkdir $RANDOM_MAPS;
94mkdir $BDB_ENV_DIR;
95 107
96our $EMERGENCY_POSITION; 108our $EMERGENCY_POSITION;
97 109
98sub cf::map::normalise; 110sub cf::map::normalise;
99 111
110=item $cf::RUNTIME 122=item $cf::RUNTIME
111 123
112The time this server has run, starts at 0 and is increased by $cf::TICK on 124The time this server has run, starts at 0 and is increased by $cf::TICK on
113every server tick. 125every server tick.
114 126
115=item $cf::LIBDIR 127=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
128$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
129$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
116 130
117The perl library directory, where extensions and cf-specific modules can 131Various directories - "/etc", read-only install directory, perl-library
118be found. It will be added to C<@INC> automatically. 132directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
133unique-items directory, player file directory, random maps directory and
134database environment.
119 135
120=item $cf::NOW 136=item $cf::NOW
121 137
122The time of the last (current) server tick. 138The time of the last (current) server tick.
123 139
128=item %cf::CFG 144=item %cf::CFG
129 145
130Configuration for the server, loaded from C</etc/crossfire/config>, or 146Configuration for the server, loaded from C</etc/crossfire/config>, or
131from wherever your confdir points to. 147from wherever your confdir points to.
132 148
133=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 149=item cf::wait_for_tick, cf::wait_for_tick_begin
134 150
135These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 151These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
136or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 152returns directly I<after> the tick processing (and consequently, can only wake one process
137processing has been done. Call C<< ->wait >> on them to maximise the 153per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
138window of cpu time available, or simply to synchronise to the server tick.
139 154
140=back 155=back
141 156
142=cut 157=cut
143 158
144BEGIN { 159BEGIN {
145 *CORE::GLOBAL::warn = sub { 160 *CORE::GLOBAL::warn = sub {
146 my $msg = join "", @_; 161 my $msg = join "", @_;
147 utf8::encode $msg;
148 162
149 $msg .= "\n" 163 $msg .= "\n"
150 unless $msg =~ /\n$/; 164 unless $msg =~ /\n$/;
151 165
166 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
167
168 utf8::encode $msg;
152 LOG llevError, $msg; 169 LOG llevError, $msg;
153 }; 170 };
154} 171}
155 172
156@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 173@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
202 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 219 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
203 $d 220 $d
204 } || "[unable to dump $_[0]: '$@']"; 221 } || "[unable to dump $_[0]: '$@']";
205} 222}
206 223
207use JSON::Syck (); # TODO# replace by JSON::PC once working 224use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
208 225
209=item $ref = cf::from_json $json 226=item $ref = cf::from_json $json
210 227
211Converts a JSON string into the corresponding perl data structure. 228Converts a JSON string into the corresponding perl data structure.
212 229
213=cut
214
215sub from_json($) {
216 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
217 JSON::Syck::Load $_[0]
218}
219
220=item $json = cf::to_json $ref 230=item $json = cf::to_json $ref
221 231
222Converts a perl data structure into its JSON representation. 232Converts a perl data structure into its JSON representation.
223
224=cut
225
226sub to_json($) {
227 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
228 JSON::Syck::Dump $_[0]
229}
230 233
231=item cf::lock_wait $string 234=item cf::lock_wait $string
232 235
233Wait until the given lock is available. See cf::lock_acquire. 236Wait until the given lock is available. See cf::lock_acquire.
234 237
240returned. 243returned.
241 244
242Lock names should begin with a unique identifier (for example, cf::map::find 245Lock names should begin with a unique identifier (for example, cf::map::find
243uses map_find and cf::map::load uses map_load). 246uses map_find and cf::map::load uses map_load).
244 247
248=item $locked = cf::lock_active $string
249
250Return true if the lock is currently active, i.e. somebody has locked it.
251
245=cut 252=cut
246 253
247our %LOCK; 254our %LOCK;
248 255
249sub lock_wait($) { 256sub lock_wait($) {
268 # wake up all waiters, to be on the safe side 275 # wake up all waiters, to be on the safe side
269 $_->ready for @{ delete $LOCK{$key} }; 276 $_->ready for @{ delete $LOCK{$key} };
270 } 277 }
271} 278}
272 279
280sub lock_active($) {
281 my ($key) = @_;
282
283 ! ! $LOCK{$key}
284}
285
273sub freeze_mainloop { 286sub freeze_mainloop {
274 return unless $TICK_WATCHER->is_active; 287 return unless $TICK_WATCHER->is_active;
275 288
276 my $guard = Coro::guard { 289 my $guard = Coro::guard {
277 $TICK_WATCHER->start; 290 $TICK_WATCHER->start;
278 $WRITE_RUNTIME_WATCHER->start;
279 }; 291 };
280 $WRITE_RUNTIME_WATCHER->stop;
281 $TICK_WATCHER->stop; 292 $TICK_WATCHER->stop;
282 $guard 293 $guard
283} 294}
284 295
285=item cf::async { BLOCK } 296=item cf::async { BLOCK }
356 367
357 $coro 368 $coro
358} 369}
359 370
360sub write_runtime { 371sub write_runtime {
361 my $runtime = cf::localdir . "/runtime"; 372 my $guard = cf::lock_acquire "write_runtime";
373
374 my $runtime = "$LOCALDIR/runtime";
362 375
363 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 376 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
364 or return; 377 or return;
365 378
366 my $value = $cf::RUNTIME + 90 + 10; 379 my $value = $cf::RUNTIME + 90 + 10;
379 392
380 aio_rename "$runtime~", $runtime 393 aio_rename "$runtime~", $runtime
381 and return; 394 and return;
382 395
383 1 396 1
397}
398
399=item cf::datalog type => key => value, ...
400
401Log a datalog packet of the given type with the given key-value pairs.
402
403=cut
404
405sub datalog($@) {
406 my ($type, %kv) = @_;
407 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
384} 408}
385 409
386=back 410=back
387 411
388=cut 412=cut
787 } 811 }
788 } else { 812 } else {
789 aio_unlink $filename; 813 aio_unlink $filename;
790 aio_unlink "$filename.pst"; 814 aio_unlink "$filename.pst";
791 } 815 }
792
793 #d##TODO# nuke non .map-files if exist
794 if ($filename =~ s/\.map$//) {
795 aio_unlink $filename;
796 aio_unlink "$filename.pst";
797 }
798 } 816 }
799} 817}
800 818
801sub object_freezer_as_string { 819sub object_freezer_as_string {
802 my ($rdata, $objs) = @_; 820 my ($rdata, $objs) = @_;
808 826
809sub object_thawer_load { 827sub object_thawer_load {
810 my ($filename) = @_; 828 my ($filename) = @_;
811 829
812 my ($data, $av); 830 my ($data, $av);
813
814 #d#TODO remove .map if file does not exist
815 aio_stat $filename and $filename =~ s/\.map$//;
816 831
817 (aio_load $filename, $data) >= 0 832 (aio_load $filename, $data) >= 0
818 or return; 833 or return;
819 834
820 unless (aio_stat "$filename.pst") { 835 unless (aio_stat "$filename.pst") {
959Returns the given player object, loading it if necessary (might block). 974Returns the given player object, loading it if necessary (might block).
960 975
961=cut 976=cut
962 977
963sub playerdir($) { 978sub playerdir($) {
964 cf::localdir 979 "$PLAYERDIR/"
965 . "/"
966 . cf::playerdir
967 . "/"
968 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 980 . (ref $_[0] ? $_[0]->ob->name : $_[0])
969} 981}
970 982
971sub path($) { 983sub path($) {
972 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 984 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
973 985
974 (playerdir $login) . "/$login.pl" 986 (playerdir $login) . "/playerdata"
975} 987}
976 988
977sub find_active($) { 989sub find_active($) {
978 $cf::PLAYER{$_[0]} 990 $cf::PLAYER{$_[0]}
979 and $cf::PLAYER{$_[0]}->active 991 and $cf::PLAYER{$_[0]}->active
992 my $login = $_[0]; 1004 my $login = $_[0];
993 1005
994 my $guard = cf::lock_acquire "user_find:$login"; 1006 my $guard = cf::lock_acquire "user_find:$login";
995 1007
996 $cf::PLAYER{$_[0]} || do { 1008 $cf::PLAYER{$_[0]} || do {
1009 # rename old playerfiles to new ones
1010 #TODO: remove when no longer required
1011 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1012 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1013 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1014 aio_unlink +(playerdir $login) . "/$login.pl";
1015
997 my $pl = load_pl path $login 1016 my $pl = load_pl path $login
998 or return; 1017 or return;
999 $cf::PLAYER{$login} = $pl 1018 $cf::PLAYER{$login} = $pl
1000 } 1019 }
1001 } 1020 }
1038 1057
1039=cut 1058=cut
1040 1059
1041sub quit_character { 1060sub quit_character {
1042 my ($pl) = @_; 1061 my ($pl) = @_;
1062
1063 my $name = $pl->ob->name;
1043 1064
1044 $pl->{deny_save} = 1; 1065 $pl->{deny_save} = 1;
1045 $pl->password ("*"); # this should lock out the player until we nuked the dir 1066 $pl->password ("*"); # this should lock out the player until we nuked the dir
1046 1067
1047 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1068 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1052 my $path = playerdir $pl; 1073 my $path = playerdir $pl;
1053 my $temp = "$path~$cf::RUNTIME~deleting~"; 1074 my $temp = "$path~$cf::RUNTIME~deleting~";
1054 aio_rename $path, $temp; 1075 aio_rename $path, $temp;
1055 delete $cf::PLAYER{$pl->ob->name}; 1076 delete $cf::PLAYER{$pl->ob->name};
1056 $pl->destroy; 1077 $pl->destroy;
1078
1079 my $prefix = qr<^~\Q$name\E/>;
1080
1081 # nuke player maps
1082 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1083
1057 IO::AIO::aio_rmtree $temp; 1084 IO::AIO::aio_rmtree $temp;
1085}
1086
1087=item $pl->kick
1088
1089Kicks a player out of the game. This destroys the connection.
1090
1091=cut
1092
1093sub kick {
1094 my ($pl, $kicker) = @_;
1095
1096 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1097 $pl->killer ("kicked");
1098 $pl->ns->destroy;
1058} 1099}
1059 1100
1060=item cf::player::list_logins 1101=item cf::player::list_logins
1061 1102
1062Returns am arrayref of all valid playernames in the system, can take a 1103Returns am arrayref of all valid playernames in the system, can take a
1063while and may block, so not sync_job-capable, ever. 1104while and may block, so not sync_job-capable, ever.
1064 1105
1065=cut 1106=cut
1066 1107
1067sub list_logins { 1108sub list_logins {
1068 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1109 my $dirs = aio_readdir $PLAYERDIR
1069 or return []; 1110 or return [];
1070 1111
1071 my @logins; 1112 my @logins;
1072 1113
1073 for my $login (@$dirs) { 1114 for my $login (@$dirs) {
1108 } 1149 }
1109 1150
1110 \@paths 1151 \@paths
1111} 1152}
1112 1153
1113=item $player->ext_reply ($msgid, $msgtype, %msg) 1154=item $player->ext_reply ($msgid, %msg)
1114 1155
1115Sends an ext reply to the player. 1156Sends an ext reply to the player.
1116 1157
1117=cut 1158=cut
1118 1159
1119sub ext_reply($$$%) { 1160sub ext_reply($$%) {
1120 my ($self, $id, %msg) = @_; 1161 my ($self, $id, %msg) = @_;
1121 1162
1122 $msg{msgid} = $id; 1163 $msg{msgid} = $id;
1123 1164
1124 $self->send ("ext " . cf::to_json \%msg); 1165 $self->send ("ext " . cf::to_json \%msg);
1125} 1166}
1126 1167
1127package cf; 1168=item $player->ext_event ($type, %msg)
1169
1170Sends an ext event to the client.
1171
1172=cut
1173
1174sub ext_event($$%) {
1175 my ($self, $type, %msg) = @_;
1176
1177 $self->ns->ext_event ($type, %msg);
1178}
1179
1180=head3 cf::region
1181
1182=over 4
1183
1184=cut
1185
1186package cf::region;
1187
1188=item cf::region::find_by_path $path
1189
1190Tries to decuce the probable region for a map knowing only its path.
1191
1192=cut
1193
1194sub find_by_path($) {
1195 my ($path) = @_;
1196
1197 my ($match, $specificity);
1198
1199 for my $region (list) {
1200 if ($region->match && $path =~ $region->match) {
1201 ($match, $specificity) = ($region, $region->specificity)
1202 if $region->specificity > $specificity;
1203 }
1204 }
1205
1206 $match
1207}
1128 1208
1129=back 1209=back
1130
1131 1210
1132=head3 cf::map 1211=head3 cf::map
1133 1212
1134=over 4 1213=over 4
1135 1214
1273 1352
1274# the original (read-only) location 1353# the original (read-only) location
1275sub load_path { 1354sub load_path {
1276 my ($self) = @_; 1355 my ($self) = @_;
1277 1356
1278 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1357 "$MAPDIR/$self->{path}.map"
1279} 1358}
1280 1359
1281# the temporary/swap location 1360# the temporary/swap location
1282sub save_path { 1361sub save_path {
1283 my ($self) = @_; 1362 my ($self) = @_;
1284 1363
1285 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1364 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1286 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1365 "$TMPDIR/$path.map"
1287} 1366}
1288 1367
1289# the unique path, undef == no special unique path 1368# the unique path, undef == no special unique path
1290sub uniq_path { 1369sub uniq_path {
1291 my ($self) = @_; 1370 my ($self) = @_;
1292 1371
1293 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1372 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1294 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1373 "$UNIQUEDIR/$path"
1295} 1374}
1296 1375
1297# and all this just because we cannot iterate over 1376# and all this just because we cannot iterate over
1298# all maps in C++... 1377# all maps in C++...
1299sub change_all_map_light { 1378sub change_all_map_light {
1307 my ($self) = @_; 1386 my ($self) = @_;
1308 1387
1309 utf8::encode (my $save = $self->save_path); 1388 utf8::encode (my $save = $self->save_path);
1310 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1389 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1311 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1390 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1312
1313 #d#TODO remove .map and also nuke
1314 $save =~ s/\.map// or return;#d#
1315 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1316 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1317} 1391}
1318 1392
1319sub load_header_from($) { 1393sub load_header_from($) {
1320 my ($self, $path) = @_; 1394 my ($self, $path) = @_;
1321 1395
1371 $self->load_header_orig 1445 $self->load_header_orig
1372 or return; 1446 or return;
1373 $self->prepare_orig; 1447 $self->prepare_orig;
1374 } 1448 }
1375 1449
1450 $self->default_region (cf::region::find_by_path $self->{path})
1451 unless $self->default_region;
1452
1376 1 1453 1
1377} 1454}
1378 1455
1379sub find; 1456sub find;
1380sub find { 1457sub find {
1413 my ($self) = @_; 1490 my ($self) = @_;
1414 1491
1415 local $self->{deny_reset} = 1; # loading can take a long time 1492 local $self->{deny_reset} = 1; # loading can take a long time
1416 1493
1417 my $path = $self->{path}; 1494 my $path = $self->{path};
1495
1496 {
1418 my $guard = cf::lock_acquire "map_load:$path"; 1497 my $guard = cf::lock_acquire "map_load:$path";
1419 1498
1420 return if $self->in_memory != cf::MAP_SWAPPED; 1499 return if $self->in_memory != cf::MAP_SWAPPED;
1421 1500
1422 $self->in_memory (cf::MAP_LOADING); 1501 $self->in_memory (cf::MAP_LOADING);
1423 1502
1424 $self->alloc; 1503 $self->alloc;
1425 1504
1426 $self->pre_load; 1505 $self->pre_load;
1427
1428 $self->_load_objects ($self->{load_path}, 1)
1429 or return;
1430
1431 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1432 if delete $self->{load_original};
1433
1434 if (my $uniq = $self->uniq_path) {
1435 utf8::encode $uniq;
1436 if (aio_open $uniq, O_RDONLY, 0) {
1437 $self->clear_unique_items;
1438 $self->_load_objects ($uniq, 0);
1439 }
1440 }
1441
1442 Coro::cede;
1443
1444 # now do the right thing for maps
1445 $self->link_multipart_objects;
1446
1447 unless ($self->{deny_activate}) {
1448 $self->decay_objects;
1449 $self->fix_auto_apply;
1450 $self->update_buttons;
1451 Coro::cede; 1506 Coro::cede;
1452 $self->set_darkness_map; 1507
1508 $self->_load_objects ($self->{load_path}, 1)
1509 or return;
1510
1511 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1512 if delete $self->{load_original};
1513
1514 if (my $uniq = $self->uniq_path) {
1515 utf8::encode $uniq;
1516 if (aio_open $uniq, O_RDONLY, 0) {
1517 $self->clear_unique_items;
1518 $self->_load_objects ($uniq, 0);
1519 }
1520 }
1521
1522 Coro::cede;
1523 # now do the right thing for maps
1524 $self->link_multipart_objects;
1453 $self->difficulty ($self->estimate_difficulty) 1525 $self->difficulty ($self->estimate_difficulty)
1454 unless $self->difficulty; 1526 unless $self->difficulty;
1455 Coro::cede; 1527 Coro::cede;
1528
1529 unless ($self->{deny_activate}) {
1530 $self->decay_objects;
1531 $self->fix_auto_apply;
1532 $self->update_buttons;
1533 Coro::cede;
1534 $self->set_darkness_map;
1535 Coro::cede;
1456 $self->activate; 1536 $self->activate;
1537 }
1538
1539 $self->in_memory (cf::MAP_IN_MEMORY);
1457 } 1540 }
1458 1541
1459 $self->post_load; 1542 $self->post_load;
1460
1461 $self->in_memory (cf::MAP_IN_MEMORY);
1462} 1543}
1463 1544
1464sub customise_for { 1545sub customise_for {
1465 my ($self, $ob) = @_; 1546 my ($self, $ob) = @_;
1466 1547
1657instantiated unique items. May block. 1738instantiated unique items. May block.
1658 1739
1659=cut 1740=cut
1660 1741
1661sub unique_maps() { 1742sub unique_maps() {
1662 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 1743 my $files = aio_readdir $UNIQUEDIR
1663 or return; 1744 or return;
1664 1745
1665 my @paths; 1746 my @paths;
1666 1747
1667 for (@$files) { 1748 for (@$files) {
1820 $map->load; 1901 $map->load;
1821 $map->load_diag; 1902 $map->load_diag;
1822 1903
1823 return unless $self->contr->active; 1904 return unless $self->contr->active;
1824 $self->activate_recursive; 1905 $self->activate_recursive;
1906
1907 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1825 $self->enter_map ($map, $x, $y); 1908 $self->enter_map ($map, $x, $y);
1826} 1909}
1827 1910
1828cf::player->attach ( 1911cf::player->attach (
1829 on_logout => sub { 1912 on_logout => sub {
1842 # try to abort aborted map switching on player login :) 1925 # try to abort aborted map switching on player login :)
1843 # should happen only on crashes 1926 # should happen only on crashes
1844 if ($pl->ob->{_link_pos}) { 1927 if ($pl->ob->{_link_pos}) {
1845 $pl->ob->enter_link; 1928 $pl->ob->enter_link;
1846 (async { 1929 (async {
1847 # we need this sleep as the login has a concurrent enter_exit running
1848 # and this sleep increases chances of the player not ending up in scorn
1849 $pl->ob->reply (undef, 1930 $pl->ob->reply (undef,
1850 "There was an internal problem at your last logout, " 1931 "There was an internal problem at your last logout, "
1851 . "the server will try to bring you to your intended destination in a second.", 1932 . "the server will try to bring you to your intended destination in a second.",
1852 cf::NDI_RED); 1933 cf::NDI_RED);
1934 # we need this sleep as the login has a concurrent enter_exit running
1935 # and this sleep increases chances of the player not ending up in scorn
1853 Coro::Timer::sleep 1; 1936 Coro::Timer::sleep 1;
1854 $pl->ob->leave_link; 1937 $pl->ob->leave_link;
1855 })->prio (2); 1938 })->prio (2);
1856 } 1939 }
1857 }, 1940 },
1921 2004
1922 $rmp->{random_seed} ||= $exit->random_seed; 2005 $rmp->{random_seed} ||= $exit->random_seed;
1923 2006
1924 my $data = cf::to_json $rmp; 2007 my $data = cf::to_json $rmp;
1925 my $md5 = Digest::MD5::md5_hex $data; 2008 my $md5 = Digest::MD5::md5_hex $data;
1926 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2009 my $meta = "$RANDOMDIR/$md5.meta";
1927 2010
1928 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2011 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1929 aio_write $fh, 0, (length $data), $data, 0; 2012 aio_write $fh, 0, (length $data), $data, 0;
1930 undef $fh; 2013 undef $fh;
1931 aio_rename "$meta~", $meta; 2014 aio_rename "$meta~", $meta;
1940 2023
1941 return unless $self->type == cf::PLAYER; 2024 return unless $self->type == cf::PLAYER;
1942 2025
1943 if ($exit->slaying eq "/!") { 2026 if ($exit->slaying eq "/!") {
1944 #TODO: this should de-fi-ni-te-ly not be a sync-job 2027 #TODO: this should de-fi-ni-te-ly not be a sync-job
2028 # the problem is that $exit might not survive long enough
2029 # so it needs to be done right now, right here
1945 cf::sync_job { prepare_random_map $exit }; 2030 cf::sync_job { prepare_random_map $exit };
1946 } 2031 }
1947 2032
1948 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2033 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1949 my $hp = $exit->stats->hp; 2034 my $hp = $exit->stats->hp;
1957 $self->goto ($slaying, $hp, $sp); 2042 $self->goto ($slaying, $hp, $sp);
1958 2043
1959 1; 2044 1;
1960 }) { 2045 }) {
1961 $self->message ("Something went wrong deep within the crossfire server. " 2046 $self->message ("Something went wrong deep within the crossfire server. "
1962 . "I'll try to bring you back to the map you were before. " 2047 . "I'll try to bring you back to the map you were before. "
1963 . "Please report this to the dungeon master!", 2048 . "Please report this to the dungeon master!",
1964 cf::NDI_UNIQUE | cf::NDI_RED); 2049 cf::NDI_UNIQUE | cf::NDI_RED);
1965 2050
1966 warn "ERROR in enter_exit: $@"; 2051 warn "ERROR in enter_exit: $@";
1967 $self->leave_link; 2052 $self->leave_link;
1968 } 2053 }
1969 })->prio (1); 2054 })->prio (1);
1982 2067
1983sub cf::client::send_drawinfo { 2068sub cf::client::send_drawinfo {
1984 my ($self, $text, $flags) = @_; 2069 my ($self, $text, $flags) = @_;
1985 2070
1986 utf8::encode $text; 2071 utf8::encode $text;
1987 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2072 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1988} 2073}
1989 2074
2075=item $client->ext_event ($type, %msg)
2076
2077Sends an exti event to the client.
2078
2079=cut
2080
2081sub cf::client::ext_event($$%) {
2082 my ($self, $type, %msg) = @_;
2083
2084 $msg{msgtype} = "event_$type";
2085 $self->send_packet ("ext " . cf::to_json \%msg);
2086}
1990 2087
1991=item $success = $client->query ($flags, "text", \&cb) 2088=item $success = $client->query ($flags, "text", \&cb)
1992 2089
1993Queues a query to the client, calling the given callback with 2090Queues a query to the client, calling the given callback with
1994the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2091the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2091 2188
2092# here we export the classes and methods available to script code 2189# here we export the classes and methods available to script code
2093 2190
2094=pod 2191=pod
2095 2192
2096The following fucntions and emthods are available within a safe environment: 2193The following functions and methods are available within a safe environment:
2097 2194
2098 cf::object contr pay_amount pay_player map 2195 cf::object contr pay_amount pay_player map
2099 cf::object::player player 2196 cf::object::player player
2100 cf::player peaceful 2197 cf::player peaceful
2101 cf::map trigger 2198 cf::map trigger
2186############################################################################# 2283#############################################################################
2187 2284
2188=head2 EXTENSION DATABASE SUPPORT 2285=head2 EXTENSION DATABASE SUPPORT
2189 2286
2190Crossfire maintains a very simple database for extension use. It can 2287Crossfire maintains a very simple database for extension use. It can
2191currently store anything that can be serialised using Storable, which 2288currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2192excludes objects. 2289convert to/from binary).
2193 2290
2194The parameter C<$family> should best start with the name of the extension 2291The parameter C<$family> should best start with the name of the extension
2195using it, it should be unique. 2292using it, it should be unique.
2196 2293
2197=over 4 2294=over 4
2220 BDB::CREATE | BDB::AUTO_COMMIT, 0666; 2317 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2221 cf::cleanup "db_open(db): $!" if $!; 2318 cf::cleanup "db_open(db): $!" if $!;
2222 }; 2319 };
2223 cf::cleanup "db_open(db): $@" if $@; 2320 cf::cleanup "db_open(db): $@" if $@;
2224 }; 2321 };
2225
2226 my $path = cf::localdir . "/database.pst";
2227 if (stat $path) {
2228 cf::sync_job {
2229 my $pst = Storable::retrieve $path;
2230
2231 cf::db_put (board => data => $pst->{board});
2232 cf::db_put (guildrules => data => $pst->{guildrules});
2233 cf::db_put (rent => balance => $pst->{rent}{balance});
2234 BDB::db_env_txn_checkpoint $DB_ENV;
2235
2236 unlink $path;
2237 };
2238 }
2239 } 2322 }
2240} 2323}
2241 2324
2242sub db_get($$) { 2325sub db_get($$) {
2243 my $key = "$_[0]/$_[1]"; 2326 my $key = "$_[0]/$_[1]";
2244 2327
2245 cf::sync_job { 2328 cf::sync_job {
2246 BDB::db_get $DB, undef, $key, my $data; 2329 BDB::db_get $DB, undef, $key, my $data;
2247 2330
2248 $! ? () 2331 $! ? ()
2249 : Compress::LZF::sthaw $data 2332 : $data
2250 } 2333 }
2251} 2334}
2252 2335
2253sub db_put($$$) { 2336sub db_put($$$) {
2254 BDB::dbreq_pri 4; 2337 BDB::dbreq_pri 4;
2255 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { }; 2338 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2256} 2339}
2340
2341=item cf::cache $id => [$paths...], $processversion => $process
2342
2343Generic caching function that returns the value of the resource $id,
2344caching and regenerating as required.
2345
2346This function can block.
2347
2348=cut
2349
2350sub cache {
2351 my ($id, $src, $processversion, $process) = @_;
2352
2353 my $meta =
2354 join "\x00",
2355 $processversion,
2356 map {
2357 aio_stat $_
2358 and Carp::croak "$_: $!";
2359
2360 ($_, (stat _)[7,9])
2361 } @$src;
2362
2363 my $dbmeta = db_get cache => "$id/meta";
2364 if ($dbmeta ne $meta) {
2365 # changed, we may need to process
2366
2367 my @data;
2368 my $md5;
2369
2370 for (0 .. $#$src) {
2371 0 <= aio_load $src->[$_], $data[$_]
2372 or Carp::croak "$src->[$_]: $!";
2373 }
2374
2375 # if processing is expensive, check
2376 # checksum first
2377 if (1) {
2378 $md5 =
2379 join "\x00",
2380 $processversion,
2381 map {
2382 Coro::cede;
2383 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2384 } 0.. $#$src;
2385
2386
2387 my $dbmd5 = db_get cache => "$id/md5";
2388 if ($dbmd5 eq $md5) {
2389 db_put cache => "$id/meta", $meta;
2390
2391 return db_get cache => "$id/data";
2392 }
2393 }
2394
2395 my $t1 = Time::HiRes::time;
2396 my $data = $process->(\@data);
2397 my $t2 = Time::HiRes::time;
2398
2399 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2400
2401 db_put cache => "$id/data", $data;
2402 db_put cache => "$id/md5" , $md5;
2403 db_put cache => "$id/meta", $meta;
2404
2405 return $data;
2406 }
2407
2408 db_get cache => "$id/data"
2409}
2410
2411=item fork_call { }, $args
2412
2413Executes the given code block with the given arguments in a seperate
2414process, returning the results. Everything must be serialisable with
2415Coro::Storable. May, of course, block. Note that the executed sub may
2416never block itself or use any form of Event handling.
2417
2418=cut
2419
2420sub fork_call(&@) {
2421 my ($cb, @args) = @_;
2422
2423# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2424# or die "socketpair: $!";
2425 pipe my $fh1, my $fh2
2426 or die "pipe: $!";
2427
2428 if (my $pid = fork) {
2429 close $fh2;
2430
2431 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2432 $res = Coro::Storable::thaw $res;
2433
2434 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2435
2436 die $$res unless "ARRAY" eq ref $res;
2437
2438 return wantarray ? @$res : $res->[-1];
2439 } else {
2440 local $SIG{__WARN__};
2441 eval {
2442 local $SIG{__DIE__};
2443 close $fh1;
2444
2445 my @res = eval { $cb->(@args) };
2446 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2447 };
2448
2449 warn $@ if $@;
2450 _exit 0;
2451 }
2452}
2453
2454
2257 2455
2258############################################################################# 2456#############################################################################
2259# the server's init and main functions 2457# the server's init and main functions
2260 2458
2261sub load_resources { 2459sub load_facedata($) {
2262 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2460 my ($path) = @_;
2461
2462 warn "loading facedata from $path\n";
2463
2464 my $facedata;
2465 0 < aio_load $path, $facedata
2466 or die "$path: $!";
2467
2468 $facedata = Coro::Storable::thaw $facedata;
2469
2470 $facedata->{version} == 2
2471 or cf::cleanup "$path: version mismatch, cannot proceed.";
2472
2473 {
2474 my $faces = $facedata->{faceinfo};
2475
2476 while (my ($face, $info) = each %$faces) {
2477 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2478 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2479 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2480 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2481 Coro::cede;
2482 }
2483
2484 while (my ($face, $info) = each %$faces) {
2485 next unless $info->{smooth};
2486 my $idx = cf::face::find $face
2487 or next;
2488 if (my $smooth = cf::face::find $info->{smooth}) {
2489 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2490 } else {
2491 warn "smooth face '$info->{smooth}' not found for face '$face'";
2492 }
2493 Coro::cede;
2494 }
2495 }
2496
2497 {
2498 my $anims = $facedata->{animinfo};
2499
2500 while (my ($anim, $info) = each %$anims) {
2501 cf::anim::set $anim, $info->{frames}, $info->{facings};
2502 Coro::cede;
2503 }
2504
2505 cf::anim::invalidate_all; # d'oh
2506 }
2507
2508 1
2509}
2510
2511sub reload_regions {
2512 load_resource_file "$MAPDIR/regions"
2263 or die "unable to load regions file\n";#d# 2513 or die "unable to load regions file\n";
2514}
2515
2516sub reload_facedata {
2517 load_facedata "$DATADIR/facedata"
2518 or die "unable to load facedata\n";
2519}
2520
2521sub reload_archetypes {
2522 load_resource_file "$DATADIR/archetypes"
2523 or die "unable to load archetypes\n";
2524}
2525
2526sub reload_treasures {
2527 load_resource_file "$DATADIR/treasures"
2528 or die "unable to load treasurelists\n";
2529}
2530
2531sub reload_resources {
2532 warn "reloading resource files...\n";
2533
2534 reload_regions;
2535 reload_facedata;
2536 reload_archetypes;
2537 reload_treasures;
2538
2539 warn "finished reloading resource files\n";
2540}
2541
2542sub init {
2543 reload_resources;
2264} 2544}
2265 2545
2266sub cfg_load { 2546sub cfg_load {
2267 open my $fh, "<:utf8", cf::confdir . "/config" 2547 open my $fh, "<:utf8", "$CONFDIR/config"
2268 or return; 2548 or return;
2269 2549
2270 local $/; 2550 local $/;
2271 *CFG = YAML::Syck::Load <$fh>; 2551 *CFG = YAML::Syck::Load <$fh>;
2272 2552
2280 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2560 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2281 and die "WARNING: m(un)lockall failed: $!\n"; 2561 and die "WARNING: m(un)lockall failed: $!\n";
2282 }; 2562 };
2283 warn $@ if $@; 2563 warn $@ if $@;
2284 } 2564 }
2285}
2286
2287sub init {
2288 load_resources;
2289} 2565}
2290 2566
2291sub main { 2567sub main {
2292 # we must not ever block the main coroutine 2568 # we must not ever block the main coroutine
2293 local $Coro::idle = sub { 2569 local $Coro::idle = sub {
2361 2637
2362 warn Carp::longmess "post_cleanup backtrace" 2638 warn Carp::longmess "post_cleanup backtrace"
2363 if $make_core; 2639 if $make_core;
2364} 2640}
2365 2641
2366sub reload() { 2642sub do_reload_perl() {
2367 # can/must only be called in main 2643 # can/must only be called in main
2368 if ($Coro::current != $Coro::main) { 2644 if ($Coro::current != $Coro::main) {
2369 warn "can only reload from main coroutine"; 2645 warn "can only reload from main coroutine";
2370 return; 2646 return;
2371 } 2647 }
2372 2648
2373 warn "reloading..."; 2649 warn "reloading...";
2374 2650
2375 warn "entering sync_job"; 2651 warn "entering sync_job";
2376 2652
2377 sync_job { 2653 cf::sync_job {
2378 write_runtime; 2654 cf::write_runtime; # external watchdog should not bark
2379 cf::emergency_save; 2655 cf::emergency_save;
2380 write_runtime; 2656 cf::write_runtime; # external watchdog should not bark
2381 2657
2382 warn "syncing database to disk"; 2658 warn "syncing database to disk";
2383 BDB::db_env_txn_checkpoint $DB_ENV; 2659 BDB::db_env_txn_checkpoint $DB_ENV;
2384 2660
2385 # if anything goes wrong in here, we should simply crash as we already saved 2661 # if anything goes wrong in here, we should simply crash as we already saved
2396 Coro::cede; 2672 Coro::cede;
2397 last unless IO::AIO::nreqs || BDB::nreqs; 2673 last unless IO::AIO::nreqs || BDB::nreqs;
2398 warn "iterate..."; 2674 warn "iterate...";
2399 } 2675 }
2400 2676
2677 ++$RELOAD;
2678
2401 warn "cancelling all extension coros"; 2679 warn "cancelling all extension coros";
2402 $_->cancel for values %EXT_CORO; 2680 $_->cancel for values %EXT_CORO;
2403 %EXT_CORO = (); 2681 %EXT_CORO = ();
2404 2682
2405 warn "removing commands"; 2683 warn "removing commands";
2444 Symbol::delete_package "safe::$_" 2722 Symbol::delete_package "safe::$_"
2445 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2723 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2446 2724
2447 warn "unloading cf.pm \"a bit\""; 2725 warn "unloading cf.pm \"a bit\"";
2448 delete $INC{"cf.pm"}; 2726 delete $INC{"cf.pm"};
2727 delete $INC{"cf/pod.pm"};
2449 2728
2450 # don't, removes xs symbols, too, 2729 # don't, removes xs symbols, too,
2451 # and global variables created in xs 2730 # and global variables created in xs
2452 #Symbol::delete_package __PACKAGE__; 2731 #Symbol::delete_package __PACKAGE__;
2453 2732
2462 2741
2463 warn "loading extensions"; 2742 warn "loading extensions";
2464 cf::load_extensions; 2743 cf::load_extensions;
2465 2744
2466 warn "reattaching attachments to objects/players"; 2745 warn "reattaching attachments to objects/players";
2467 _global_reattach; 2746 _global_reattach; # objects, sockets
2468 warn "reattaching attachments to maps"; 2747 warn "reattaching attachments to maps";
2469 reattach $_ for values %MAP; 2748 reattach $_ for values %MAP;
2470 2749 warn "reattaching attachments to players";
2471 warn "loading reloadable resources"; 2750 reattach $_ for values %PLAYER;
2472 load_resources;
2473 2751
2474 warn "leaving sync_job"; 2752 warn "leaving sync_job";
2475 2753
2476 1 2754 1
2477 } or do { 2755 } or do {
2483 warn "reloaded"; 2761 warn "reloaded";
2484}; 2762};
2485 2763
2486our $RELOAD_WATCHER; # used only during reload 2764our $RELOAD_WATCHER; # used only during reload
2487 2765
2766sub reload_perl() {
2767 # doing reload synchronously and two reloads happen back-to-back,
2768 # coro crashes during coro_state_free->destroy here.
2769
2770 $RELOAD_WATCHER ||= Event->timer (
2771 reentrant => 0,
2772 after => 0,
2773 data => WF_AUTOCANCEL,
2774 cb => sub {
2775 do_reload_perl;
2776 undef $RELOAD_WATCHER;
2777 },
2778 );
2779}
2780
2488register_command "reload" => sub { 2781register_command "reload" => sub {
2489 my ($who, $arg) = @_; 2782 my ($who, $arg) = @_;
2490 2783
2491 if ($who->flag (FLAG_WIZ)) { 2784 if ($who->flag (FLAG_WIZ)) {
2492 $who->message ("reloading server."); 2785 $who->message ("reloading server.");
2493 2786 async { reload_perl };
2494 # doing reload synchronously and two reloads happen back-to-back,
2495 # coro crashes during coro_state_free->destroy here.
2496
2497 $RELOAD_WATCHER ||= Event->timer (
2498 reentrant => 0,
2499 after => 0,
2500 data => WF_AUTOCANCEL,
2501 cb => sub {
2502 reload;
2503 undef $RELOAD_WATCHER;
2504 },
2505 );
2506 } 2787 }
2507}; 2788};
2508 2789
2509unshift @INC, $LIBDIR; 2790unshift @INC, $LIBDIR;
2510 2791
2511my $bug_warning = 0; 2792my $bug_warning = 0;
2793
2794our @WAIT_FOR_TICK;
2795our @WAIT_FOR_TICK_BEGIN;
2796
2797sub wait_for_tick {
2798 return unless $TICK_WATCHER->is_active;
2799 return if $Coro::current == $Coro::main;
2800
2801 my $signal = new Coro::Signal;
2802 push @WAIT_FOR_TICK, $signal;
2803 $signal->wait;
2804}
2805
2806sub wait_for_tick_begin {
2807 return unless $TICK_WATCHER->is_active;
2808 return if $Coro::current == $Coro::main;
2809
2810 my $signal = new Coro::Signal;
2811 push @WAIT_FOR_TICK_BEGIN, $signal;
2812 $signal->wait;
2813}
2512 2814
2513$TICK_WATCHER = Event->timer ( 2815$TICK_WATCHER = Event->timer (
2514 reentrant => 0, 2816 reentrant => 0,
2515 parked => 1, 2817 parked => 1,
2516 prio => 0, 2818 prio => 0,
2524 } 2826 }
2525 2827
2526 $NOW = Event::time; 2828 $NOW = Event::time;
2527 2829
2528 cf::server_tick; # one server iteration 2830 cf::server_tick; # one server iteration
2831
2529 $RUNTIME += $TICK; 2832 $RUNTIME += $TICK;
2530 $NEXT_TICK += $TICK; 2833 $NEXT_TICK += $TICK;
2531 2834
2532 $WAIT_FOR_TICK->broadcast; 2835 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2533 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2836 $NEXT_RUNTIME_WRITE = $NOW + 10;
2837 Coro::async_pool {
2838 write_runtime
2839 or warn "ERROR: unable to write runtime file: $!";
2840 };
2841 }
2534 2842
2535# my $AFTER = Event::time; 2843# my $AFTER = Event::time;
2536# warn $AFTER - $NOW;#d# 2844# warn $AFTER - $NOW;#d#
2537 2845
2538 # if we are delayed by four ticks or more, skip them all 2846 # if we are delayed by four ticks or more, skip them all
2539 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2847 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2540 2848
2541 $TICK_WATCHER->at ($NEXT_TICK); 2849 $TICK_WATCHER->at ($NEXT_TICK);
2542 $TICK_WATCHER->start; 2850 $TICK_WATCHER->start;
2851
2852 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2853 $sig->send;
2854 }
2855 while (my $sig = shift @WAIT_FOR_TICK) {
2856 $sig->send;
2857 }
2858
2859 _post_tick;
2543 }, 2860 },
2544); 2861);
2545 2862
2546{ 2863{
2547 BDB::max_poll_time $TICK * 0.1; 2864 BDB::max_poll_time $TICK * 0.1;
2575 2892
2576 cf::sync_job { 2893 cf::sync_job {
2577 eval { 2894 eval {
2578 BDB::db_env_open 2895 BDB::db_env_open
2579 $DB_ENV, 2896 $DB_ENV,
2580 $BDB_ENV_DIR, 2897 $BDBDIR,
2581 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 2898 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2582 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 2899 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2583 0666; 2900 0666;
2584 2901
2585 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 2902 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2586 2903
2587 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 2904 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2588 $DB_ENV->set_lk_detect; 2905 $DB_ENV->set_lk_detect;
2589 }; 2906 };
2590 2907
2598 2915
2599 undef $Coro::AIO::WATCHER; 2916 undef $Coro::AIO::WATCHER;
2600 IO::AIO::max_poll_time $TICK * 0.1; 2917 IO::AIO::max_poll_time $TICK * 0.1;
2601 $AIO_POLL_WATCHER = Event->io ( 2918 $AIO_POLL_WATCHER = Event->io (
2602 reentrant => 0, 2919 reentrant => 0,
2920 data => WF_AUTOCANCEL,
2603 fd => IO::AIO::poll_fileno, 2921 fd => IO::AIO::poll_fileno,
2604 poll => 'r', 2922 poll => 'r',
2605 prio => 6, 2923 prio => 6,
2606 data => WF_AUTOCANCEL,
2607 cb => \&IO::AIO::poll_cb, 2924 cb => \&IO::AIO::poll_cb,
2608 ); 2925 );
2609} 2926}
2610 2927
2611$WRITE_RUNTIME_WATCHER = Event->timer ( 2928# load additional modules
2612 reentrant => 0, 2929use cf::pod;
2613 data => WF_AUTOCANCEL,
2614 parked => 1,
2615 after => 1,
2616 interval => 10,
2617 prio => 6, # keep it lowest so it acts like a watchdog
2618 cb => sub {
2619 $TICK_WATCHER->is_active or cf::cleanup "mainloop frozen but runtime active", 1;
2620
2621 Coro::async_pool {
2622 write_runtime
2623 or warn "ERROR: unable to write runtime file: $!";
2624 };
2625 },
2626);
2627 2930
2628END { cf::emergency_save } 2931END { cf::emergency_save }
2629 2932
26301 29331
2631 2934

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines