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.120 by root, Tue Jan 2 11:08:36 2007 UTC vs.
Revision 1.166 by root, Sat Jan 13 23:06:13 2007 UTC

8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3; 13use Coro 3.3 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
19 19
20use Data::Dumper;
20use Digest::MD5; 21use Digest::MD5;
21use Fcntl; 22use Fcntl;
22use IO::AIO 2.31 (); 23use IO::AIO 2.32 ();
23use YAML::Syck (); 24use YAML::Syck ();
24use Time::HiRes; 25use Time::HiRes;
25 26
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 27use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 32$YAML::Syck::ImplicitUnicode = 1;
30 33
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 35
35our %COMMAND = (); 36our %COMMAND = ();
36our %COMMAND_TIME = (); 37our %COMMAND_TIME = ();
38
39our @EXTS = (); # list of extension package names
37our %EXTCMD = (); 40our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps
38 43
39our @EVENT; 44our @EVENT;
40our $LIBDIR = datadir . "/ext"; 45our $LIBDIR = datadir . "/ext";
41 46
42our $TICK = MAX_TIME * 1e-6; 47our $TICK = MAX_TIME * 1e-6;
47our %CFG; 52our %CFG;
48 53
49our $UPTIME; $UPTIME ||= time; 54our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 55our $RUNTIME;
51 56
57our %PLAYER; # all users
52our %MAP; # all maps 58our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 59our $LINK_MAP; # the special {link} map, which is always available
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 60our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 61
62our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
63our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
64
65# used to convert map paths into valid unix filenames by replacing / by ∕
66our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
57 67
58binmode STDOUT; 68binmode STDOUT;
59binmode STDERR; 69binmode STDERR;
60 70
61# read virtual server time, if available 71# read virtual server time, if available
69mkdir cf::localdir . "/" . cf::playerdir; 79mkdir cf::localdir . "/" . cf::playerdir;
70mkdir cf::localdir . "/" . cf::tmpdir; 80mkdir cf::localdir . "/" . cf::tmpdir;
71mkdir cf::localdir . "/" . cf::uniquedir; 81mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 82mkdir $RANDOM_MAPS;
73 83
74# a special map that is always available 84our $EMERGENCY_POSITION;
75our $LINK_MAP;
76
77our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
78 85
79############################################################################# 86#############################################################################
80 87
81=head2 GLOBAL VARIABLES 88=head2 GLOBAL VARIABLES
82 89
106 113
107=item %cf::CFG 114=item %cf::CFG
108 115
109Configuration for the server, loaded from C</etc/crossfire/config>, or 116Configuration for the server, loaded from C</etc/crossfire/config>, or
110from wherever your confdir points to. 117from wherever your confdir points to.
118
119=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE
120
121These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)
122or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick
123processing has been done. Call C<< ->wait >> on them to maximise the
124window of cpu time available, or simply to synchronise to the server tick.
111 125
112=back 126=back
113 127
114=cut 128=cut
115 129
119 utf8::encode $msg; 133 utf8::encode $msg;
120 134
121 $msg .= "\n" 135 $msg .= "\n"
122 unless $msg =~ /\n$/; 136 unless $msg =~ /\n$/;
123 137
124 LOG llevError, "cfperl: $msg"; 138 LOG llevError, $msg;
125 }; 139 };
126} 140}
127 141
128@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 142@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
129@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 143@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
147 161
148$Event::DIED = sub { 162$Event::DIED = sub {
149 warn "error in event callback: @_"; 163 warn "error in event callback: @_";
150}; 164};
151 165
152my %ext_pkg;
153my @exts;
154my @hook;
155
156=head2 UTILITY FUNCTIONS 166=head2 UTILITY FUNCTIONS
157 167
158=over 4 168=over 4
159 169
170=item dumpval $ref
171
160=cut 172=cut
173
174sub dumpval {
175 eval {
176 local $SIG{__DIE__};
177 my $d;
178 if (1) {
179 $d = new Data::Dumper([$_[0]], ["*var"]);
180 $d->Terse(1);
181 $d->Indent(2);
182 $d->Quotekeys(0);
183 $d->Useqq(1);
184 #$d->Bless(...);
185 $d->Seen($_[1]) if @_ > 1;
186 $d = $d->Dump();
187 }
188 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
189 $d
190 } || "[unable to dump $_[0]: '$@']";
191}
161 192
162use JSON::Syck (); # TODO# replace by JSON::PC once working 193use JSON::Syck (); # TODO# replace by JSON::PC once working
163 194
164=item $ref = cf::from_json $json 195=item $ref = cf::from_json $json
165 196
181sub to_json($) { 212sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 213 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 214 JSON::Syck::Dump $_[0]
184} 215}
185 216
186=item my $guard = cf::guard { BLOCK }
187
188Run the given callback when the guard object gets destroyed (useful for
189coroutine cancellations).
190
191You can call C<< ->cancel >> on the guard object to stop the block from
192being executed.
193
194=cut
195
196sub guard(&) {
197 bless \(my $cb = $_[0]), cf::guard::;
198}
199
200sub cf::guard::cancel {
201 ${$_[0]} = sub { };
202}
203
204sub cf::guard::DESTROY {
205 ${$_[0]}->();
206}
207
208=item cf::lock_wait $string 217=item cf::lock_wait $string
209 218
210Wait until the given lock is available. See cf::lock_acquire. 219Wait until the given lock is available. See cf::lock_acquire.
211 220
212=item my $lock = cf::lock_acquire $string 221=item my $lock = cf::lock_acquire $string
213 222
214Wait until the given lock is available and then acquires it and returns 223Wait until the given lock is available and then acquires it and returns
215a guard object. If the guard object gets destroyed (goes out of scope, 224a Coro::guard object. If the guard object gets destroyed (goes out of scope,
216for example when the coroutine gets canceled), the lock is automatically 225for example when the coroutine gets canceled), the lock is automatically
217returned. 226returned.
218 227
219Lock names should begin with a unique identifier (for example, find_map 228Lock names should begin with a unique identifier (for example, cf::map::find
220uses map_find and load_map uses map_load). 229uses map_find and cf::map::load uses map_load).
221 230
222=cut 231=cut
223 232
224our %LOCK; 233our %LOCK;
225 234
239 # wait, to be sure we are not locked 248 # wait, to be sure we are not locked
240 lock_wait $key; 249 lock_wait $key;
241 250
242 $LOCK{$key} = []; 251 $LOCK{$key} = [];
243 252
244 cf::guard { 253 Coro::guard {
245 # wake up all waiters, to be on the safe side 254 # wake up all waiters, to be on the safe side
246 $_->ready for @{ delete $LOCK{$key} }; 255 $_->ready for @{ delete $LOCK{$key} };
247 } 256 }
248} 257}
258
259sub freeze_mainloop {
260 return unless $TICK_WATCHER->is_active;
261
262 my $guard = Coro::guard { $TICK_WATCHER->start };
263 $TICK_WATCHER->stop;
264 $guard
265}
266
267=item cf::async { BLOCK }
268
269Currently the same as Coro::async_pool, meaning you cannot use
270C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
271thing you are allowed to do is call C<prio> on it.
272
273=cut
274
275BEGIN { *async = \&Coro::async_pool }
249 276
250=item cf::sync_job { BLOCK } 277=item cf::sync_job { BLOCK }
251 278
252The design of crossfire+ requires that the main coro ($Coro::main) is 279The design of crossfire+ requires that the main coro ($Coro::main) is
253always able to handle events or runnable, as crossfire+ is only partly 280always able to handle events or runnable, as crossfire+ is only partly
267 # this is the main coro, too bad, we have to block 294 # this is the main coro, too bad, we have to block
268 # till the operation succeeds, freezing the server :/ 295 # till the operation succeeds, freezing the server :/
269 296
270 # TODO: use suspend/resume instead 297 # TODO: use suspend/resume instead
271 # (but this is cancel-safe) 298 # (but this is cancel-safe)
272 local $FREEZE = 1; 299 my $freeze_guard = freeze_mainloop;
273 300
274 my $busy = 1; 301 my $busy = 1;
275 my @res; 302 my @res;
276 303
277 (Coro::async { 304 (async {
278 @res = eval { $job->() }; 305 @res = eval { $job->() };
279 warn $@ if $@; 306 warn $@ if $@;
280 undef $busy; 307 undef $busy;
281 })->prio (Coro::PRIO_MAX); 308 })->prio (Coro::PRIO_MAX);
282 309
283 while ($busy) { 310 while ($busy) {
284 Coro::cede_notself; 311 Coro::cede or Event::one_event;
285 Event::one_event unless Coro::nready;
286 } 312 }
287 313
288 wantarray ? @res : $res[0] 314 wantarray ? @res : $res[0]
289 } else { 315 } else {
290 # we are in another coroutine, how wonderful, everything just works 316 # we are in another coroutine, how wonderful, everything just works
291 317
292 $job->() 318 $job->()
293 } 319 }
294} 320}
295 321
296=item $coro = cf::coro { BLOCK } 322=item $coro = cf::async_ext { BLOCK }
297 323
298Creates and returns a new coro. This coro is automcatially being canceled 324Like async, but this coro is automatically being canceled when the
299when the extension calling this is being unloaded. 325extension calling this is being unloaded.
300 326
301=cut 327=cut
302 328
303sub coro(&) { 329sub async_ext(&) {
304 my $cb = shift; 330 my $cb = shift;
305 331
306 my $coro; $coro = async { 332 my $coro = &Coro::async ($cb);
307 eval {
308 $cb->();
309 };
310 warn $@ if $@;
311 };
312 333
313 $coro->on_destroy (sub { 334 $coro->on_destroy (sub {
314 delete $EXT_CORO{$coro+0}; 335 delete $EXT_CORO{$coro+0};
315 }); 336 });
316 $EXT_CORO{$coro+0} = $coro; 337 $EXT_CORO{$coro+0} = $coro;
317 338
318 $coro 339 $coro
319} 340}
320 341
321sub write_runtime { 342sub write_runtime {
343 return unless $TICK_WATCHER->is_active;
344
322 my $runtime = cf::localdir . "/runtime"; 345 my $runtime = cf::localdir . "/runtime";
323 346
324 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 347 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
325 or return; 348 or return;
326 349
341} 364}
342 365
343=back 366=back
344 367
345=cut 368=cut
346
347#############################################################################
348
349package cf::path;
350
351sub new {
352 my ($class, $path, $base) = @_;
353
354 $path = $path->as_string if ref $path;
355
356 my $self = bless { }, $class;
357
358 # {... are special paths that are not touched
359 # ?xxx/... are special absolute paths
360 # ?random/... random maps
361 # /! non-realised random map exit
362 # /... normal maps
363 # ~/... per-player maps without a specific player (DO NOT USE)
364 # ~user/... per-player map of a specific user
365
366 if ($path =~ /^{/) {
367 # fine as it is
368 } elsif ($path =~ s{^\?random/}{}) {
369 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
370 $self->{random} = cf::from_json $data;
371 } else {
372 if ($path =~ s{^~([^/]+)?}{}) {
373 $self->{user_rel} = 1;
374
375 if (defined $1) {
376 $self->{user} = $1;
377 } elsif ($base =~ m{^~([^/]+)/}) {
378 $self->{user} = $1;
379 } else {
380 warn "cannot resolve user-relative path without user <$path,$base>\n";
381 }
382 } elsif ($path =~ /^\//) {
383 # already absolute
384 } else {
385 $base =~ s{[^/]+/?$}{};
386 return $class->new ("$base/$path");
387 }
388
389 for ($path) {
390 redo if s{/\.?/}{/};
391 redo if s{/[^/]+/\.\./}{/};
392 }
393 }
394
395 $self->{path} = $path;
396
397 $self
398}
399
400# the name / primary key / in-game path
401sub as_string {
402 my ($self) = @_;
403
404 $self->{user_rel} ? "~$self->{user}$self->{path}"
405 : $self->{random} ? "?random/$self->{path}"
406 : $self->{path}
407}
408
409# the displayed name, this is a one way mapping
410sub visible_name {
411 my ($self) = @_;
412
413# if (my $rmp = $self->{random}) {
414# # todo: be more intelligent about this
415# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
416# } else {
417 $self->as_string
418# }
419}
420
421# escape the /'s in the path
422sub _escaped_path {
423 # ∕ is U+2215
424 (my $path = $_[0]{path}) =~ s/\//∕/g;
425 $path
426}
427
428# the original (read-only) location
429sub load_path {
430 my ($self) = @_;
431
432 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
433}
434
435# the temporary/swap location
436sub save_path {
437 my ($self) = @_;
438
439 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
440 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
441 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
442}
443
444# the unique path, might be eq to save_path
445sub uniq_path {
446 my ($self) = @_;
447
448 $self->{user_rel} || $self->{random}
449 ? undef
450 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
451}
452
453# return random map parameters, or undef
454sub random_map_params {
455 my ($self) = @_;
456
457 $self->{random}
458}
459
460# this is somewhat ugly, but style maps do need special treatment
461sub is_style_map {
462 $_[0]{path} =~ m{^/styles/}
463}
464
465package cf;
466 369
467############################################################################# 370#############################################################################
468 371
469=head2 ATTACHABLE OBJECTS 372=head2 ATTACHABLE OBJECTS
470 373
917=cut 820=cut
918 821
919sub register_extcmd { 822sub register_extcmd {
920 my ($name, $cb) = @_; 823 my ($name, $cb) = @_;
921 824
922 my $caller = caller;
923 #warn "registering extcmd '$name' to '$caller'";
924
925 $EXTCMD{$name} = [$cb, $caller]; 825 $EXTCMD{$name} = $cb;
926} 826}
927 827
928cf::player->attach ( 828cf::player->attach (
929 on_command => sub { 829 on_command => sub {
930 my ($pl, $name, $params) = @_; 830 my ($pl, $name, $params) = @_;
943 843
944 my $msg = eval { from_json $buf }; 844 my $msg = eval { from_json $buf };
945 845
946 if (ref $msg) { 846 if (ref $msg) {
947 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 847 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
948 if (my %reply = $cb->[0]->($pl, $msg)) { 848 if (my %reply = $cb->($pl, $msg)) {
949 $pl->ext_reply ($msg->{msgid}, %reply); 849 $pl->ext_reply ($msg->{msgid}, %reply);
950 } 850 }
951 } 851 }
952 } else { 852 } else {
953 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 853 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
955 855
956 cf::override; 856 cf::override;
957 }, 857 },
958); 858);
959 859
960sub register {
961 my ($base, $pkg) = @_;
962
963 #TODO
964}
965
966sub load_extension { 860sub load_extension {
967 my ($path) = @_; 861 my ($path) = @_;
968 862
969 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 863 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
970 my $base = $1; 864 my $base = $1;
971 my $pkg = $1; 865 my $pkg = $1;
972 $pkg =~ s/[^[:word:]]/_/g; 866 $pkg =~ s/[^[:word:]]/_/g;
973 $pkg = "ext::$pkg"; 867 $pkg = "ext::$pkg";
974 868
975 warn "loading '$path' into '$pkg'\n"; 869 warn "... loading '$path' into '$pkg'\n";
976 870
977 open my $fh, "<:utf8", $path 871 open my $fh, "<:utf8", $path
978 or die "$path: $!"; 872 or die "$path: $!";
979 873
980 my $source = 874 my $source =
981 "package $pkg; use strict; use utf8;\n" 875 "package $pkg; use strict; use utf8;\n"
982 . "#line 1 \"$path\"\n{\n" 876 . "#line 1 \"$path\"\n{\n"
983 . (do { local $/; <$fh> }) 877 . (do { local $/; <$fh> })
984 . "\n};\n1"; 878 . "\n};\n1";
985 879
986 eval $source 880 unless (eval $source) {
987 or die $@ ? "$path: $@\n" 881 my $msg = $@ ? "$path: $@\n"
988 : "extension disabled.\n"; 882 : "extension disabled.\n";
989 883 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
990 push @exts, $pkg; 884 warn $@;
991 $ext_pkg{$base} = $pkg; 885 warn "mandatory extension failed to load, exiting.\n";
992 886 exit 1;
993# no strict 'refs'; 887 }
994# @{"$pkg\::ISA"} = ext::; 888 die $@;
995
996 register $base, $pkg;
997}
998
999sub unload_extension {
1000 my ($pkg) = @_;
1001
1002 warn "removing extension $pkg\n";
1003
1004 # remove hooks
1005 #TODO
1006# for my $idx (0 .. $#PLUGIN_EVENT) {
1007# delete $hook[$idx]{$pkg};
1008# } 889 }
1009 890
1010 # remove commands 891 push @EXTS, $pkg;
1011 for my $name (keys %COMMAND) {
1012 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
1013
1014 if (@cb) {
1015 $COMMAND{$name} = \@cb;
1016 } else {
1017 delete $COMMAND{$name};
1018 }
1019 }
1020
1021 # remove extcmds
1022 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1023 delete $EXTCMD{$name};
1024 }
1025
1026 if (my $cb = $pkg->can ("unload")) {
1027 eval {
1028 $cb->($pkg);
1029 1
1030 } or warn "$pkg unloaded, but with errors: $@";
1031 }
1032
1033 Symbol::delete_package $pkg;
1034} 892}
1035 893
1036sub load_extensions { 894sub load_extensions {
1037 for my $ext (<$LIBDIR/*.ext>) { 895 for my $ext (<$LIBDIR/*.ext>) {
1038 next unless -r $ext; 896 next unless -r $ext;
1056}; 914};
1057 915
1058cf::map->attach (prio => -10000, package => cf::mapsupport::); 916cf::map->attach (prio => -10000, package => cf::mapsupport::);
1059 917
1060############################################################################# 918#############################################################################
1061# load/save perl data associated with player->ob objects
1062
1063sub all_objects(@) {
1064 @_, map all_objects ($_->inv), @_
1065}
1066
1067# TODO: compatibility cruft, remove when no longer needed
1068cf::player->attach (
1069 on_load => sub {
1070 my ($pl, $path) = @_;
1071
1072 for my $o (all_objects $pl->ob) {
1073 if (my $value = $o->get_ob_key_value ("_perl_data")) {
1074 $o->set_ob_key_value ("_perl_data");
1075
1076 %$o = %{ Storable::thaw pack "H*", $value };
1077 }
1078 }
1079 },
1080);
1081
1082#############################################################################
1083 919
1084=head2 CORE EXTENSIONS 920=head2 CORE EXTENSIONS
1085 921
1086Functions and methods that extend core crossfire objects. 922Functions and methods that extend core crossfire objects.
1087 923
924=cut
925
926package cf::player;
927
928use Coro::AIO;
929
1088=head3 cf::player 930=head3 cf::player
1089 931
1090=over 4 932=over 4
1091 933
1092=item cf::player::exists $login 934=item cf::player::find $login
1093 935
1094Returns true when the given account exists. 936Returns the given player object, loading it if necessary (might block).
1095 937
1096=cut 938=cut
1097 939
1098sub cf::player::exists($) { 940sub playerdir($) {
1099 cf::player::find $_[0] 941 cf::localdir
1100 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 942 . "/"
943 . cf::playerdir
944 . "/"
945 . (ref $_[0] ? $_[0]->ob->name : $_[0])
946}
947
948sub path($) {
949 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
950
951 (playerdir $login) . "/$login.pl"
952}
953
954sub find_active($) {
955 $cf::PLAYER{$_[0]}
956 and $cf::PLAYER{$_[0]}->active
957 and $cf::PLAYER{$_[0]}
958}
959
960sub exists($) {
961 my ($login) = @_;
962
963 $cf::PLAYER{$login}
964 or cf::sync_job { !aio_stat $login }
965}
966
967sub find($) {
968 return $cf::PLAYER{$_[0]} || do {
969 my $login = $_[0];
970
971 my $guard = cf::lock_acquire "user_find:$login";
972
973 $cf::PLAYER{$_[0]} || do {
974 my $pl = load_pl path $login
975 or return;
976 $cf::PLAYER{$login} = $pl
977 }
978 }
979}
980
981sub save($) {
982 my ($pl) = @_;
983
984 return if $pl->{deny_save};
985
986 my $path = path $pl;
987 my $guard = cf::lock_acquire "user_save:$path";
988
989 return if $pl->{deny_save};
990
991 aio_mkdir playerdir $pl, 0770;
992 $pl->{last_save} = $cf::RUNTIME;
993
994 $pl->save_pl ($path);
995 Coro::cede;
996}
997
998sub new($) {
999 my ($login) = @_;
1000
1001 my $self = create;
1002
1003 $self->ob->name ($login);
1004 $self->{deny_save} = 1;
1005
1006 $cf::PLAYER{$login} = $self;
1007
1008 $self
1009}
1010
1011=item $pl->quit_character
1012
1013Nukes the player without looking back. If logged in, the connection will
1014be destroyed. May block for a long time.
1015
1016=cut
1017
1018sub quit_character {
1019 my ($pl) = @_;
1020
1021 $pl->{deny_save} = 1;
1022 $pl->password ("*"); # this should lock out the player until we nuked the dir
1023
1024 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1025 $pl->deactivate;
1026 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1027 $pl->ns->destroy if $pl->ns;
1028
1029 my $path = playerdir $pl;
1030 my $temp = "$path~$cf::RUNTIME~deleting~";
1031 aio_rename $path, $temp;
1032 delete $cf::PLAYER{$pl->ob->name};
1033 $pl->destroy;
1034 IO::AIO::aio_rmtree $temp;
1035}
1036
1037=item cf::player::list_logins
1038
1039Returns am arrayref of all valid playernames in the system, can take a
1040while and may block, so not sync_job-capable, ever.
1041
1042=cut
1043
1044sub list_logins {
1045 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
1046 or return [];
1047
1048 my @logins;
1049
1050 for my $login (@$dirs) {
1051 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1052 aio_read $fh, 0, 512, my $buf, 0 or next;
1053 $buf !~ /^password -------------$/m or next; # official not-valid tag
1054
1055 utf8::decode $login;
1056 push @logins, $login;
1057 }
1058
1059 \@logins
1060}
1061
1062=item $player->maps
1063
1064Returns an arrayref of map paths that are private for this
1065player. May block.
1066
1067=cut
1068
1069sub maps($) {
1070 my ($pl) = @_;
1071
1072 my $files = aio_readdir playerdir $pl
1073 or return;
1074
1075 my @paths;
1076
1077 for (@$files) {
1078 utf8::decode $_;
1079 next if /\.(?:pl|pst)$/;
1080 next unless /^$PATH_SEP/o;
1081
1082 push @paths, "~" . $pl->ob->name . "/" . $_;
1083 }
1084
1085 \@paths
1101} 1086}
1102 1087
1103=item $player->ext_reply ($msgid, $msgtype, %msg) 1088=item $player->ext_reply ($msgid, $msgtype, %msg)
1104 1089
1105Sends an ext reply to the player. 1090Sends an ext reply to the player.
1106 1091
1107=cut 1092=cut
1108 1093
1109sub cf::player::ext_reply($$$%) { 1094sub ext_reply($$$%) {
1110 my ($self, $id, %msg) = @_; 1095 my ($self, $id, %msg) = @_;
1111 1096
1112 $msg{msgid} = $id; 1097 $msg{msgid} = $id;
1113 1098
1114 $self->send ("ext " . to_json \%msg); 1099 $self->send ("ext " . cf::to_json \%msg);
1115} 1100}
1101
1102package cf;
1116 1103
1117=back 1104=back
1118 1105
1119 1106
1120=head3 cf::map 1107=head3 cf::map
1126package cf::map; 1113package cf::map;
1127 1114
1128use Fcntl; 1115use Fcntl;
1129use Coro::AIO; 1116use Coro::AIO;
1130 1117
1118use overload
1119 '""' => \&as_string;
1120
1131our $MAX_RESET = 7200; 1121our $MAX_RESET = 3600;
1132our $DEFAULT_RESET = 3600; 1122our $DEFAULT_RESET = 3000;
1133 1123
1134sub generate_random_map { 1124sub generate_random_map {
1135 my ($path, $rmp) = @_; 1125 my ($self, $rmp) = @_;
1136 1126
1137 # mit "rum" bekleckern, nicht 1127 # mit "rum" bekleckern, nicht
1138 cf::map::_create_random_map 1128 $self->_create_random_map (
1139 $path,
1140 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1129 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1141 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1130 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1142 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1131 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1143 $rmp->{exit_on_final_map}, 1132 $rmp->{exit_on_final_map},
1144 $rmp->{xsize}, $rmp->{ysize}, 1133 $rmp->{xsize}, $rmp->{ysize},
1145 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1134 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1146 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1135 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1147 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1136 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1148 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1137 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1149 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1138 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1150 (cf::region::find $rmp->{region}) 1139 (cf::region::find $rmp->{region}), $rmp->{custom}
1140 )
1141}
1142
1143sub register {
1144 my (undef, $regex) = @_;
1145 my $pkg = caller;
1146
1147 no strict;
1148 push @{"$pkg\::ISA"}, __PACKAGE__;
1149
1150 $EXT_MAP{$pkg} = qr<$regex>;
1151}
1152
1153# also paths starting with '/'
1154$EXT_MAP{"cf::map"} = qr{^(?=/)};
1155
1156sub normalise {
1157 my ($path, $base) = @_;
1158
1159 # map plan:
1160 #
1161 # /! non-realised random map exit (special hack!)
1162 # {... are special paths that are not being touched
1163 # ?xxx/... are special absolute paths
1164 # ?random/... random maps
1165 # /... normal maps
1166 # ~user/... per-player map of a specific user
1167
1168 $path =~ s/$PATH_SEP/\//go;
1169
1170 # treat it as relative path if it starts with
1171 # something that looks reasonable
1172 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1173 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1174
1175 $base =~ s{[^/]+/?$}{};
1176 $path = "$base/$path";
1177 }
1178
1179 for ($path) {
1180 redo if s{//}{/};
1181 redo if s{/\.?/}{/};
1182 redo if s{/[^/]+/\.\./}{/};
1183 }
1184
1185 $path
1186}
1187
1188sub new_from_path {
1189 my (undef, $path, $base) = @_;
1190
1191 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1192
1193 $path = normalise $path, $base;
1194
1195 for my $pkg (keys %EXT_MAP) {
1196 if ($path =~ $EXT_MAP{$pkg}) {
1197 my $self = bless cf::map::new, $pkg;
1198 $self->{path} = $path; $self->path ($path);
1199 $self->init; # pass $1 etc.
1200 return $self;
1201 }
1202 }
1203
1204 Carp::carp "unable to resolve path '$path'.";
1205 ()
1206}
1207
1208sub init {
1209 my ($self) = @_;
1210
1211 $self
1212}
1213
1214sub as_string {
1215 my ($self) = @_;
1216
1217 "$self->{path}"
1218}
1219
1220# the displayed name, this is a one way mapping
1221sub visible_name {
1222 &as_string
1223}
1224
1225# escape the /'s in the path
1226sub _escaped_path {
1227 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1228
1229 $path
1230}
1231
1232# the original (read-only) location
1233sub load_path {
1234 my ($self) = @_;
1235
1236 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
1237}
1238
1239# the temporary/swap location
1240sub save_path {
1241 my ($self) = @_;
1242
1243 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $self->_escaped_path
1244}
1245
1246# the unique path, undef == no special unique path
1247sub uniq_path {
1248 my ($self) = @_;
1249
1250 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
1151} 1251}
1152 1252
1153# and all this just because we cannot iterate over 1253# and all this just because we cannot iterate over
1154# all maps in C++... 1254# all maps in C++...
1155sub change_all_map_light { 1255sub change_all_map_light {
1156 my ($change) = @_; 1256 my ($change) = @_;
1157 1257
1158 $_->change_map_light ($change) for values %cf::MAP; 1258 $_->change_map_light ($change)
1259 for grep $_->outdoor, values %cf::MAP;
1159} 1260}
1160 1261
1262sub unlink_save {
1263 my ($self) = @_;
1264
1265 utf8::encode (my $save = $self->save_path);
1266 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;
1267 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";
1268}
1269
1161sub try_load_header($) { 1270sub load_header_from($) {
1162 my ($path) = @_; 1271 my ($self, $path) = @_;
1163 1272
1164 utf8::encode $path; 1273 utf8::encode $path;
1165 aio_open $path, O_RDONLY, 0 1274 aio_open $path, O_RDONLY, 0
1166 or return; 1275 or return;
1167 1276
1168 my $map = cf::map::new 1277 $self->_load_header ($path)
1169 or return; 1278 or return;
1170 1279
1171 $map->load_header ($path) 1280 $self->{load_path} = $path;
1281
1282 1
1283}
1284
1285sub load_orig {
1286 my ($self) = @_;
1287
1288 $self->load_header_from ($self->load_path)
1289}
1290
1291sub load_temp {
1292 my ($self) = @_;
1293
1294 $self->load_header_from ($self->save_path)
1295}
1296
1297sub load_header {
1298 my ($self) = @_;
1299
1300 if ($self->load_temp) {
1301 $self->last_access ((delete $self->{last_access})
1302 || $cf::RUNTIME); #d#
1303 # safety
1304 $self->{instantiate_time} = $cf::RUNTIME
1305 if $self->{instantiate_time} > $cf::RUNTIME;
1306 } else {
1307 $self->load_orig
1172 or return; 1308 or return;
1173 1309
1174 $map->{load_path} = $path; 1310 $self->{load_original} = 1;
1311 $self->{instantiate_time} = $cf::RUNTIME;
1312 $self->last_access ($cf::RUNTIME);
1313 $self->instantiate;
1314 }
1175 1315
1176 $map 1316 1
1177} 1317}
1178 1318
1319sub find;
1179sub find_map { 1320sub find {
1180 my ($path, $origin) = @_; 1321 my ($path, $origin) = @_;
1181 1322
1182 #warn "find_map<$path,$origin>\n";#d#
1183
1184 $path = new cf::path $path, $origin && $origin->path; 1323 $path = normalise $path, $origin && $origin->path;
1185 my $key = $path->as_string;
1186 1324
1187 cf::lock_wait "map_find:$key"; 1325 cf::lock_wait "map_find:$path";
1188 1326
1189 $cf::MAP{$key} || do { 1327 $cf::MAP{$path} || do {
1190 my $guard = cf::lock_acquire "map_find:$key"; 1328 my $guard = cf::lock_acquire "map_find:$path";
1191 1329 my $map = new_from_path cf::map $path
1192 # do it the slow way
1193 my $map = try_load_header $path->save_path;
1194
1195 if ($map) {
1196 # safety
1197 $map->{instantiate_time} = $cf::RUNTIME
1198 if $map->{instantiate_time} > $cf::RUNTIME;
1199 } else {
1200 if (my $rmp = $path->random_map_params) {
1201 $map = generate_random_map $key, $rmp;
1202 } else {
1203 $map = try_load_header $path->load_path;
1204 }
1205
1206 $map or return; 1330 or return;
1207 1331
1208 $map->{load_original} = 1;
1209 $map->{instantiate_time} = $cf::RUNTIME;
1210 $map->instantiate;
1211
1212 # per-player maps become, after loading, normal maps
1213 $map->per_player (0) if $path->{user_rel};
1214 }
1215 #Coro::Timer::sleep 1;#d#
1216
1217 $map->path ($key);
1218 $map->{path} = $path;
1219 $map->{last_save} = $cf::RUNTIME; 1332 $map->{last_save} = $cf::RUNTIME;
1220 $map->last_access ($cf::RUNTIME); 1333
1334 $map->load_header
1335 or return;
1221 1336
1222 if ($map->should_reset) { 1337 if ($map->should_reset) {
1223 $map->reset; 1338 $map->reset;
1339 undef $guard;
1224 $map = find_map $path; 1340 $map = find $path
1341 or return;
1225 } 1342 }
1226 1343
1227 $cf::MAP{$key} = $map 1344 $cf::MAP{$path} = $map
1228 } 1345 }
1229} 1346}
1230 1347
1231sub load { 1348sub load {
1232 my ($self) = @_; 1349 my ($self) = @_;
1233 1350
1234 my $path = $self->{path}; 1351 my $path = $self->{path};
1235 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1352 my $guard = cf::lock_acquire "map_load:$path";
1236 1353
1237 return if $self->in_memory != cf::MAP_SWAPPED; 1354 return if $self->in_memory != cf::MAP_SWAPPED;
1238 1355
1239 $self->in_memory (cf::MAP_LOADING); 1356 $self->in_memory (cf::MAP_LOADING);
1240 1357
1241 $self->alloc; 1358 $self->alloc;
1242 $self->load_objects ($self->{load_path}, 1) 1359 $self->_load_objects ($self->{load_path}, 1)
1243 or return; 1360 or return;
1244 1361
1245 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1362 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1246 if delete $self->{load_original}; 1363 if delete $self->{load_original};
1247 1364
1248 if (my $uniq = $path->uniq_path) { 1365 if (my $uniq = $self->uniq_path) {
1249 utf8::encode $uniq; 1366 utf8::encode $uniq;
1250 if (aio_open $uniq, O_RDONLY, 0) { 1367 if (aio_open $uniq, O_RDONLY, 0) {
1251 $self->clear_unique_items; 1368 $self->clear_unique_items;
1252 $self->load_objects ($uniq, 0); 1369 $self->_load_objects ($uniq, 0);
1253 } 1370 }
1254 } 1371 }
1372
1373 Coro::cede;
1255 1374
1256 # now do the right thing for maps 1375 # now do the right thing for maps
1257 $self->link_multipart_objects; 1376 $self->link_multipart_objects;
1258 1377
1259 if ($self->{path}->is_style_map) { 1378 unless ($self->{deny_activate}) {
1260 $self->{deny_save} = 1; 1379 $self->decay_objects;
1261 $self->{deny_reset} = 1;
1262 } else {
1263 $self->fix_auto_apply; 1380 $self->fix_auto_apply;
1264 $self->decay_objects;
1265 $self->update_buttons; 1381 $self->update_buttons;
1382 Coro::cede;
1266 $self->set_darkness_map; 1383 $self->set_darkness_map;
1267 $self->difficulty ($self->estimate_difficulty) 1384 $self->difficulty ($self->estimate_difficulty)
1268 unless $self->difficulty; 1385 unless $self->difficulty;
1386 Coro::cede;
1269 $self->activate; 1387 $self->activate;
1270 } 1388 }
1271 1389
1272 $self->in_memory (cf::MAP_IN_MEMORY); 1390 $self->in_memory (cf::MAP_IN_MEMORY);
1273} 1391}
1274 1392
1275sub load_map_sync { 1393sub customise_for {
1394 my ($self, $ob) = @_;
1395
1396 return find "~" . $ob->name . "/" . $self->{path}
1397 if $self->per_player;
1398
1399 $self
1400}
1401
1402# find and load all maps in the 3x3 area around a map
1403sub load_diag {
1404 my ($map) = @_;
1405
1406 my @diag; # diagonal neighbours
1407
1408 for (0 .. 3) {
1409 my $neigh = $map->tile_path ($_)
1410 or next;
1411 $neigh = find $neigh, $map
1412 or next;
1413 $neigh->load;
1414
1415 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1416 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1417 }
1418
1419 for (@diag) {
1420 my $neigh = find @$_
1421 or next;
1422 $neigh->load;
1423 }
1424}
1425
1426sub find_sync {
1276 my ($path, $origin) = @_; 1427 my ($path, $origin) = @_;
1277 1428
1278 #warn "load_map_sync<$path, $origin>\n";#d# 1429 cf::sync_job { find $path, $origin }
1430}
1279 1431
1280 cf::sync_job { 1432sub do_load_sync {
1281 my $map = cf::map::find_map $path, $origin 1433 my ($map) = @_;
1434
1435 cf::sync_job { $map->load };
1436}
1437
1438our %MAP_PREFETCH;
1439our $MAP_PREFETCHER = Coro::async {
1440 while () {
1441 for my $path (keys %MAP_PREFETCH) {
1442 my $map = find $path
1282 or return; 1443 or next;
1283 $map->load; 1444 $map->load;
1284 $map 1445
1446 delete $MAP_PREFETCH{$path};
1447 }
1448 Coro::schedule;
1285 } 1449 }
1450};
1451
1452sub find_async {
1453 my ($path, $origin) = @_;
1454
1455 $path = normalise $path, $origin && $origin->{path};
1456
1457 if (my $map = $cf::MAP{$path}) {
1458 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1459 }
1460
1461 $MAP_PREFETCH{$path} = 0;
1462 $MAP_PREFETCHER->ready;
1463
1464 ()
1286} 1465}
1287 1466
1288sub save { 1467sub save {
1289 my ($self) = @_; 1468 my ($self) = @_;
1290 1469
1470 my $lock = cf::lock_acquire "map_data:" . $self->path;
1471
1291 $self->{last_save} = $cf::RUNTIME; 1472 $self->{last_save} = $cf::RUNTIME;
1292 1473
1293 return unless $self->dirty; 1474 return unless $self->dirty;
1294 1475
1295 my $save = $self->{path}->save_path; utf8::encode $save; 1476 my $save = $self->save_path; utf8::encode $save;
1296 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1477 my $uniq = $self->uniq_path; utf8::encode $uniq;
1297 1478
1298 $self->{load_path} = $save; 1479 $self->{load_path} = $save;
1299 1480
1300 return if $self->{deny_save}; 1481 return if $self->{deny_save};
1301 1482
1483 local $self->{last_access} = $self->last_access;#d#
1484
1485 cf::async {
1486 $_->contr->save for $self->players;
1487 };
1488
1302 if ($uniq) { 1489 if ($uniq) {
1303 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1490 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1304 $self->save_objects ($uniq, cf::IO_UNIQUES); 1491 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1305 } else { 1492 } else {
1306 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1493 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1307 } 1494 }
1308} 1495}
1309 1496
1310sub swap_out { 1497sub swap_out {
1311 my ($self) = @_; 1498 my ($self) = @_;
1499
1500 # save first because save cedes
1501 $self->save;
1502
1503 my $lock = cf::lock_acquire "map_data:" . $self->path;
1312 1504
1313 return if $self->players; 1505 return if $self->players;
1314 return if $self->in_memory != cf::MAP_IN_MEMORY; 1506 return if $self->in_memory != cf::MAP_IN_MEMORY;
1315 return if $self->{deny_save}; 1507 return if $self->{deny_save};
1316 1508
1317 $self->save;
1318 $self->clear; 1509 $self->clear;
1319 $self->in_memory (cf::MAP_SWAPPED); 1510 $self->in_memory (cf::MAP_SWAPPED);
1320} 1511}
1321 1512
1322sub reset_at { 1513sub reset_at {
1323 my ($self) = @_; 1514 my ($self) = @_;
1324 1515
1325 # TODO: safety, remove and allow resettable per-player maps 1516 # TODO: safety, remove and allow resettable per-player maps
1326 return 1e99 if $self->{path}{user_rel}; 1517 return 1e99 if $self->isa ("ext::map_per_player");
1327 return 1e99 if $self->{deny_reset}; 1518 return 1e99 if $self->{deny_reset};
1328 1519
1329 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1520 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1330 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1521 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1331 1522
1336 my ($self) = @_; 1527 my ($self) = @_;
1337 1528
1338 $self->reset_at <= $cf::RUNTIME 1529 $self->reset_at <= $cf::RUNTIME
1339} 1530}
1340 1531
1341sub unlink_save {
1342 my ($self) = @_;
1343
1344 utf8::encode (my $save = $self->{path}->save_path);
1345 aioreq_pri 3; IO::AIO::aio_unlink $save;
1346 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1347}
1348
1349sub rename { 1532sub rename {
1350 my ($self, $new_path) = @_; 1533 my ($self, $new_path) = @_;
1351 1534
1535 normalise $new_path;
1536
1352 $self->unlink_save; 1537 $self->unlink_save;
1353 1538
1354 delete $cf::MAP{$self->path}; 1539 delete $cf::MAP{$self->path};
1355 $self->{path} = new cf::path $new_path; 1540 $self->{path} = $new_path; $self->path ($self->{path});
1356 $self->path ($self->{path}->as_string);
1357 $cf::MAP{$self->path} = $self; 1541 $cf::MAP{$self->path} = $self;
1358 1542
1359 $self->save; 1543 $self->save;
1360} 1544}
1361 1545
1362sub reset { 1546sub reset {
1363 my ($self) = @_; 1547 my ($self) = @_;
1364 1548
1549 my $lock = cf::lock_acquire "map_data:" . $self->path;
1550
1365 return if $self->players; 1551 return if $self->players;
1366 return if $self->{path}{user_rel};#d# 1552 return if $self->isa ("ext::map_per_player");#d#
1367 1553
1368 warn "resetting map ", $self->path;#d# 1554 warn "resetting map ", $self->path;#d#
1369 1555
1370 delete $cf::MAP{$self->path}; 1556 delete $cf::MAP{$self->path};
1371 1557
1384 $self->reset_timeout (1); 1570 $self->reset_timeout (1);
1385 $self->rename ("{nuke}/" . ($nuke_counter++)); 1571 $self->rename ("{nuke}/" . ($nuke_counter++));
1386 $self->reset; # polite request, might not happen 1572 $self->reset; # polite request, might not happen
1387} 1573}
1388 1574
1389sub customise_for { 1575=item cf::map::unique_maps
1390 my ($map, $ob) = @_;
1391 1576
1392 if ($map->per_player) { 1577Returns an arrayref of paths of all shared maps that have
1393 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1578instantiated unique items. May block.
1394 }
1395 1579
1396 $map 1580=cut
1397}
1398 1581
1399sub emergency_save { 1582sub unique_maps() {
1400 local $cf::FREEZE = 1; 1583 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1584 or return;
1401 1585
1402 warn "enter emergency map save\n"; 1586 my @paths;
1403 1587
1404 cf::sync_job { 1588 for (@$files) {
1405 warn "begin emergency map save\n"; 1589 utf8::decode $_;
1406 $_->save for values %cf::MAP; 1590 next if /\.pst$/;
1591 next unless /^$PATH_SEP/o;
1592
1593 push @paths, $_;
1407 }; 1594 }
1408 1595
1409 warn "end emergency map save\n"; 1596 \@paths
1410} 1597}
1411 1598
1412package cf; 1599package cf;
1413 1600
1414=back 1601=back
1415 1602
1603=head3 cf::object
1604
1605=cut
1606
1607package cf::object;
1608
1609=over 4
1610
1611=item $ob->inv_recursive
1612
1613Returns the inventory of the object _and_ their inventories, recursively.
1614
1615=cut
1616
1617sub inv_recursive_;
1618sub inv_recursive_ {
1619 map { $_, inv_recursive_ $_->inv } @_
1620}
1621
1622sub inv_recursive {
1623 inv_recursive_ inv $_[0]
1624}
1625
1626package cf;
1627
1628=back
1416 1629
1417=head3 cf::object::player 1630=head3 cf::object::player
1418 1631
1419=over 4 1632=over 4
1420 1633
1460 1673
1461=item $player_object->enter_link 1674=item $player_object->enter_link
1462 1675
1463Freezes the player and moves him/her to a special map (C<{link}>). 1676Freezes the player and moves him/her to a special map (C<{link}>).
1464 1677
1465The player should be reaosnably safe there for short amounts of time. You 1678The player should be reasonably safe there for short amounts of time. You
1466I<MUST> call C<leave_link> as soon as possible, though. 1679I<MUST> call C<leave_link> as soon as possible, though.
1467 1680
1681Will never block.
1682
1468=item $player_object->leave_link ($map, $x, $y) 1683=item $player_object->leave_link ($map, $x, $y)
1469 1684
1470Moves the player out of the specila link map onto the given map. If the 1685Moves the player out of the special C<{link}> map onto the specified
1471map is not valid (or omitted), the player will be moved back to the 1686map. If the map is not valid (or omitted), the player will be moved back
1472location he/she was before the call to C<enter_link>, or, if that fails, 1687to the location he/she was before the call to C<enter_link>, or, if that
1473to the emergency map position. 1688fails, to the emergency map position.
1474 1689
1475Might block. 1690Might block.
1476 1691
1477=cut 1692=cut
1693
1694sub link_map {
1695 unless ($LINK_MAP) {
1696 $LINK_MAP = cf::map::find "{link}"
1697 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
1698 $LINK_MAP->load;
1699 }
1700
1701 $LINK_MAP
1702}
1478 1703
1479sub cf::object::player::enter_link { 1704sub cf::object::player::enter_link {
1480 my ($self) = @_; 1705 my ($self) = @_;
1481 1706
1482 $self->deactivate_recursive; 1707 $self->deactivate_recursive;
1483 1708
1484 return if $self->map == $LINK_MAP; 1709 return if UNIVERSAL::isa $self->map, "ext::map_link";
1485 1710
1486 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1711 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1487 if $self->map; 1712 if $self->map;
1488 1713
1489 $self->enter_map ($LINK_MAP, 20, 20); 1714 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1490} 1715}
1491 1716
1492sub cf::object::player::leave_link { 1717sub cf::object::player::leave_link {
1493 my ($self, $map, $x, $y) = @_; 1718 my ($self, $map, $x, $y) = @_;
1494 1719
1495 my $link_pos = delete $self->{_link_pos}; 1720 my $link_pos = delete $self->{_link_pos};
1496 1721
1497 unless ($map) { 1722 unless ($map) {
1498 # restore original map position 1723 # restore original map position
1499 ($map, $x, $y) = @{ $link_pos || [] }; 1724 ($map, $x, $y) = @{ $link_pos || [] };
1500 $map = cf::map::find_map $map; 1725 $map = cf::map::find $map;
1501 1726
1502 unless ($map) { 1727 unless ($map) {
1503 ($map, $x, $y) = @$EMERGENCY_POSITION; 1728 ($map, $x, $y) = @$EMERGENCY_POSITION;
1504 $map = cf::map::find_map $map 1729 $map = cf::map::find $map
1505 or die "FATAL: cannot load emergency map\n"; 1730 or die "FATAL: cannot load emergency map\n";
1506 } 1731 }
1507 } 1732 }
1508 1733
1509 ($x, $y) = (-1, -1) 1734 ($x, $y) = (-1, -1)
1512 # use -1 or undef as default coordinates, not 0, 0 1737 # use -1 or undef as default coordinates, not 0, 0
1513 ($x, $y) = ($map->enter_x, $map->enter_y) 1738 ($x, $y) = ($map->enter_x, $map->enter_y)
1514 if $x <=0 && $y <= 0; 1739 if $x <=0 && $y <= 0;
1515 1740
1516 $map->load; 1741 $map->load;
1742 $map->load_diag;
1517 1743
1744 return unless $self->contr->active;
1518 $self->activate_recursive; 1745 $self->activate_recursive;
1519 $self->enter_map ($map, $x, $y); 1746 $self->enter_map ($map, $x, $y);
1520} 1747}
1521 1748
1522cf::player->attach ( 1749cf::player->attach (
1535 1762
1536 # try to abort aborted map switching on player login :) 1763 # try to abort aborted map switching on player login :)
1537 # should happen only on crashes 1764 # should happen only on crashes
1538 if ($pl->ob->{_link_pos}) { 1765 if ($pl->ob->{_link_pos}) {
1539 $pl->ob->enter_link; 1766 $pl->ob->enter_link;
1540 Coro::async { 1767 (async {
1541 # we need this sleep as the login has a concurrent enter_exit running 1768 # we need this sleep as the login has a concurrent enter_exit running
1542 # and this sleep increases chances of the player not ending up in scorn 1769 # and this sleep increases chances of the player not ending up in scorn
1770 $pl->ob->reply (undef,
1771 "There was an internal problem at your last logout, "
1772 . "the server will try to bring you to your intended destination in a second.",
1773 cf::NDI_RED);
1543 Coro::Timer::sleep 1; 1774 Coro::Timer::sleep 1;
1544 $pl->ob->leave_link; 1775 $pl->ob->leave_link;
1545 }; 1776 })->prio (2);
1546 } 1777 }
1547 }, 1778 },
1548); 1779);
1549 1780
1550=item $player_object->goto_map ($path, $x, $y) 1781=item $player_object->goto ($path, $x, $y)
1551 1782
1552=cut 1783=cut
1553 1784
1554sub cf::object::player::goto_map { 1785sub cf::object::player::goto {
1555 my ($self, $path, $x, $y) = @_; 1786 my ($self, $path, $x, $y) = @_;
1556 1787
1557 $self->enter_link; 1788 $self->enter_link;
1558 1789
1559 (Coro::async { 1790 (async {
1560 $path = new cf::path $path;
1561
1562 my $map = cf::map::find_map $path->as_string; 1791 my $map = cf::map::find $path;
1563 $map = $map->customise_for ($self) if $map; 1792 $map = $map->customise_for ($self) if $map;
1564 1793
1565# warn "entering ", $map->path, " at ($x, $y)\n" 1794# warn "entering ", $map->path, " at ($x, $y)\n"
1566# if $map; 1795# if $map;
1567 1796
1568 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1797 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1569 1798
1570 $self->leave_link ($map, $x, $y); 1799 $self->leave_link ($map, $x, $y);
1571 })->prio (1); 1800 })->prio (1);
1572} 1801}
1573 1802
1626 1855
1627 return unless $self->type == cf::PLAYER; 1856 return unless $self->type == cf::PLAYER;
1628 1857
1629 $self->enter_link; 1858 $self->enter_link;
1630 1859
1631 (Coro::async { 1860 (async {
1861 $self->deactivate_recursive; # just to be sure
1632 unless (eval { 1862 unless (eval {
1633
1634 prepare_random_map $exit 1863 prepare_random_map $exit
1635 if $exit->slaying eq "/!"; 1864 if $exit->slaying eq "/!";
1636 1865
1637 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1866 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1638 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1867 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1639 1868
1640 1; 1869 1;
1641 }) { 1870 }) {
1642 $self->message ("Something went wrong deep within the crossfire server. " 1871 $self->message ("Something went wrong deep within the crossfire server. "
1643 . "I'll try to bring you back to the map you were before. " 1872 . "I'll try to bring you back to the map you were before. "
1644 . "Please report this to the dungeon master", 1873 . "Please report this to the dungeon master!",
1645 cf::NDI_UNIQUE | cf::NDI_RED); 1874 cf::NDI_UNIQUE | cf::NDI_RED);
1646 1875
1647 warn "ERROR in enter_exit: $@"; 1876 warn "ERROR in enter_exit: $@";
1648 $self->leave_link; 1877 $self->leave_link;
1649 } 1878 }
1700 on_reply => sub { 1929 on_reply => sub {
1701 my ($ns, $msg) = @_; 1930 my ($ns, $msg) = @_;
1702 1931
1703 # this weird shuffling is so that direct followup queries 1932 # this weird shuffling is so that direct followup queries
1704 # get handled first 1933 # get handled first
1705 my $queue = delete $ns->{query_queue}; 1934 my $queue = delete $ns->{query_queue}
1935 or return; # be conservative, not sure how that can happen, but we saw a crash here
1706 1936
1707 (shift @$queue)->[1]->($msg); 1937 (shift @$queue)->[1]->($msg);
1708 1938
1709 push @{ $ns->{query_queue} }, @$queue; 1939 push @{ $ns->{query_queue} }, @$queue;
1710 1940
1716 } 1946 }
1717 } 1947 }
1718 }, 1948 },
1719); 1949);
1720 1950
1721=item $client->coro (\&cb) 1951=item $client->async (\&cb)
1722 1952
1723Create a new coroutine, running the specified callback. The coroutine will 1953Create a new coroutine, running the specified callback. The coroutine will
1724be automatically cancelled when the client gets destroyed (e.g. on logout, 1954be automatically cancelled when the client gets destroyed (e.g. on logout,
1725or loss of connection). 1955or loss of connection).
1726 1956
1727=cut 1957=cut
1728 1958
1729sub cf::client::coro { 1959sub cf::client::async {
1730 my ($self, $cb) = @_; 1960 my ($self, $cb) = @_;
1731 1961
1732 my $coro; $coro = async { 1962 my $coro = &Coro::async ($cb);
1733 eval {
1734 $cb->();
1735 };
1736 warn $@ if $@;
1737 };
1738 1963
1739 $coro->on_destroy (sub { 1964 $coro->on_destroy (sub {
1740 delete $self->{_coro}{$coro+0}; 1965 delete $self->{_coro}{$coro+0};
1741 }); 1966 });
1742 1967
1914 2139
1915{ 2140{
1916 my $path = cf::localdir . "/database.pst"; 2141 my $path = cf::localdir . "/database.pst";
1917 2142
1918 sub db_load() { 2143 sub db_load() {
1919 warn "loading database $path\n";#d# remove later
1920 $DB = stat $path ? Storable::retrieve $path : { }; 2144 $DB = stat $path ? Storable::retrieve $path : { };
1921 } 2145 }
1922 2146
1923 my $pid; 2147 my $pid;
1924 2148
1925 sub db_save() { 2149 sub db_save() {
1926 warn "saving database $path\n";#d# remove later
1927 waitpid $pid, 0 if $pid; 2150 waitpid $pid, 0 if $pid;
1928 if (0 == ($pid = fork)) { 2151 if (0 == ($pid = fork)) {
1929 $DB->{_meta}{version} = 1; 2152 $DB->{_meta}{version} = 1;
1930 Storable::nstore $DB, "$path~"; 2153 Storable::nstore $DB, "$path~";
1931 rename "$path~", $path; 2154 rename "$path~", $path;
1979 open my $fh, "<:utf8", cf::confdir . "/config" 2202 open my $fh, "<:utf8", cf::confdir . "/config"
1980 or return; 2203 or return;
1981 2204
1982 local $/; 2205 local $/;
1983 *CFG = YAML::Syck::Load <$fh>; 2206 *CFG = YAML::Syck::Load <$fh>;
2207
2208 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2209
2210 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2211 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2212
2213 if (exists $CFG{mlockall}) {
2214 eval {
2215 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2216 and die "WARNING: m(un)lockall failed: $!\n";
2217 };
2218 warn $@ if $@;
2219 }
1984} 2220}
1985 2221
1986sub main { 2222sub main {
1987 # we must not ever block the main coroutine 2223 # we must not ever block the main coroutine
1988 local $Coro::idle = sub { 2224 local $Coro::idle = sub {
1989 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2225 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1990 (Coro::unblock_sub {
1991 Event::one_event; 2226 async { Event::one_event };
1992 })->();
1993 }; 2227 };
1994 2228
1995 cfg_load; 2229 cfg_load;
1996 db_load; 2230 db_load;
1997 load_extensions; 2231 load_extensions;
1998 Event::loop; 2232 Event::loop;
1999} 2233}
2000 2234
2001############################################################################# 2235#############################################################################
2002# initialisation 2236# initialisation and cleanup
2237
2238# install some emergency cleanup handlers
2239BEGIN {
2240 for my $signal (qw(INT HUP TERM)) {
2241 Event->signal (
2242 data => WF_AUTOCANCEL,
2243 signal => $signal,
2244 cb => sub {
2245 cf::cleanup "SIG$signal";
2246 },
2247 );
2248 }
2249}
2250
2251sub emergency_save() {
2252 my $freeze_guard = cf::freeze_mainloop;
2253
2254 warn "enter emergency perl save\n";
2255
2256 cf::sync_job {
2257 # use a peculiar iteration method to avoid tripping on perl
2258 # refcount bugs in for. also avoids problems with players
2259 # and maps saved/Destroyed asynchronously.
2260 warn "begin emergency player save\n";
2261 for my $login (keys %cf::PLAYER) {
2262 my $pl = $cf::PLAYER{$login} or next;
2263 $pl->valid or next;
2264 $pl->save;
2265 }
2266 warn "end emergency player save\n";
2267
2268 warn "begin emergency map save\n";
2269 for my $path (keys %cf::MAP) {
2270 my $map = $cf::MAP{$path} or next;
2271 $map->valid or next;
2272 $map->save;
2273 }
2274 warn "end emergency map save\n";
2275 };
2276
2277 warn "leave emergency perl save\n";
2278}
2003 2279
2004sub reload() { 2280sub reload() {
2005 # can/must only be called in main 2281 # can/must only be called in main
2006 if ($Coro::current != $Coro::main) { 2282 if ($Coro::current != $Coro::main) {
2007 warn "can only reload from main coroutine\n"; 2283 warn "can only reload from main coroutine\n";
2008 return; 2284 return;
2009 } 2285 }
2010 2286
2011 warn "reloading..."; 2287 warn "reloading...";
2012 2288
2013 local $FREEZE = 1; 2289 warn "freezing server";
2290 my $guard = freeze_mainloop;
2014 cf::emergency_save; 2291 cf::emergency_save;
2292
2293 warn "sync database to disk";
2294 cf::db_sync;
2295 IO::AIO::flush;
2015 2296
2016 eval { 2297 eval {
2017 # if anything goes wrong in here, we should simply crash as we already saved 2298 # if anything goes wrong in here, we should simply crash as we already saved
2018 2299
2019 # cancel all watchers 2300 warn "cancel all watchers";
2020 for (Event::all_watchers) { 2301 for (Event::all_watchers) {
2021 $_->cancel if $_->data & WF_AUTOCANCEL; 2302 $_->cancel if $_->data & WF_AUTOCANCEL;
2022 } 2303 }
2023 2304
2024 # cancel all extension coros 2305 warn "cancel all extension coros";
2025 $_->cancel for values %EXT_CORO; 2306 $_->cancel for values %EXT_CORO;
2026 %EXT_CORO = (); 2307 %EXT_CORO = ();
2027 2308
2309 warn "remove commands";
2310 %COMMAND = ();
2311
2312 warn "remove ext commands";
2313 %EXTCMD = ();
2314
2028 # unload all extensions 2315 warn "unload/nuke all extensions";
2029 for (@exts) { 2316 for my $pkg (@EXTS) {
2030 warn "unloading <$_>"; 2317 warn "... unloading $pkg";
2031 unload_extension $_; 2318
2319 if (my $cb = $pkg->can ("unload")) {
2320 eval {
2321 $cb->($pkg);
2322 1
2323 } or warn "$pkg unloaded, but with errors: $@";
2032 } 2324 }
2033 2325
2326 warn "... nuking $pkg";
2327 Symbol::delete_package $pkg;
2328 }
2329
2034 # unload all modules loaded from $LIBDIR 2330 warn "unload all perl modules loaded from $LIBDIR";
2035 while (my ($k, $v) = each %INC) { 2331 while (my ($k, $v) = each %INC) {
2036 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2332 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2037 2333
2038 warn "removing <$k>"; 2334 warn "removing <$k>";
2039 delete $INC{$k}; 2335 delete $INC{$k};
2046 } 2342 }
2047 2343
2048 Symbol::delete_package $k; 2344 Symbol::delete_package $k;
2049 } 2345 }
2050 2346
2051 # sync database to disk
2052 cf::db_sync;
2053 IO::AIO::flush;
2054
2055 # get rid of safe::, as good as possible 2347 warn "get rid of safe::, as good as possible";
2056 Symbol::delete_package "safe::$_" 2348 Symbol::delete_package "safe::$_"
2057 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2349 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2058 2350
2059 # remove register_script_function callbacks
2060 # TODO
2061
2062 # unload cf.pm "a bit" 2351 warn "unload cf.pm \"a bit\"";
2063 delete $INC{"cf.pm"}; 2352 delete $INC{"cf.pm"};
2064 2353
2065 # don't, removes xs symbols, too, 2354 # don't, removes xs symbols, too,
2066 # and global variables created in xs 2355 # and global variables created in xs
2067 #Symbol::delete_package __PACKAGE__; 2356 #Symbol::delete_package __PACKAGE__;
2068 2357
2069 # reload cf.pm
2070 warn "reloading cf.pm"; 2358 warn "reloading cf.pm";
2071 require cf; 2359 require cf;
2072 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2360 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2073 2361
2074 # load config and database again 2362 warn "load config and database again";
2075 cf::cfg_load; 2363 cf::cfg_load;
2076 cf::db_load; 2364 cf::db_load;
2077 2365
2078 # load extensions
2079 warn "load extensions"; 2366 warn "load extensions";
2080 cf::load_extensions; 2367 cf::load_extensions;
2081 2368
2082 # reattach attachments to objects 2369 warn "reattach attachments to objects/players";
2083 warn "reattach";
2084 _global_reattach; 2370 _global_reattach;
2371 warn "reattach attachments to maps";
2372 reattach $_ for values %MAP;
2085 }; 2373 };
2086 2374
2087 if ($@) { 2375 if ($@) {
2088 warn $@; 2376 warn $@;
2089 warn "error while reloading, exiting."; 2377 warn "error while reloading, exiting.";
2090 exit 1; 2378 exit 1;
2091 } 2379 }
2092 2380
2093 warn "reloaded successfully"; 2381 warn "reloaded";
2094}; 2382};
2095
2096#############################################################################
2097
2098unless ($LINK_MAP) {
2099 $LINK_MAP = cf::map::new;
2100
2101 $LINK_MAP->width (41);
2102 $LINK_MAP->height (41);
2103 $LINK_MAP->alloc;
2104 $LINK_MAP->path ("{link}");
2105 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2106 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2107
2108 # dirty hack because... archetypes are not yet loaded
2109 Event->timer (
2110 after => 2,
2111 cb => sub {
2112 $_[0]->w->cancel;
2113
2114 # provide some exits "home"
2115 my $exit = cf::object::new "exit";
2116
2117 $exit->slaying ($EMERGENCY_POSITION->[0]);
2118 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2119 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2120
2121 $LINK_MAP->insert ($exit->clone, 19, 19);
2122 $LINK_MAP->insert ($exit->clone, 19, 20);
2123 $LINK_MAP->insert ($exit->clone, 19, 21);
2124 $LINK_MAP->insert ($exit->clone, 20, 19);
2125 $LINK_MAP->insert ($exit->clone, 20, 21);
2126 $LINK_MAP->insert ($exit->clone, 21, 19);
2127 $LINK_MAP->insert ($exit->clone, 21, 20);
2128 $LINK_MAP->insert ($exit->clone, 21, 21);
2129
2130 $exit->destroy;
2131 });
2132
2133 $LINK_MAP->{deny_save} = 1;
2134 $LINK_MAP->{deny_reset} = 1;
2135
2136 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2137}
2138
2139register "<global>", __PACKAGE__;
2140 2383
2141register_command "reload" => sub { 2384register_command "reload" => sub {
2142 my ($who, $arg) = @_; 2385 my ($who, $arg) = @_;
2143 2386
2144 if ($who->flag (FLAG_WIZ)) { 2387 if ($who->flag (FLAG_WIZ)) {
2154 reentrant => 0, 2397 reentrant => 0,
2155 prio => 0, 2398 prio => 0,
2156 at => $NEXT_TICK || $TICK, 2399 at => $NEXT_TICK || $TICK,
2157 data => WF_AUTOCANCEL, 2400 data => WF_AUTOCANCEL,
2158 cb => sub { 2401 cb => sub {
2159 unless ($FREEZE) { 2402 $NOW = Event::time;
2403
2160 cf::server_tick; # one server iteration 2404 cf::server_tick; # one server iteration
2161 $RUNTIME += $TICK; 2405 $RUNTIME += $TICK;
2162 }
2163
2164 $NEXT_TICK += $TICK; 2406 $NEXT_TICK += $TICK;
2407
2408 $WAIT_FOR_TICK->broadcast;
2409 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2165 2410
2166 # if we are delayed by four ticks or more, skip them all 2411 # if we are delayed by four ticks or more, skip them all
2167 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2412 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2168 2413
2169 $TICK_WATCHER->at ($NEXT_TICK); 2414 $TICK_WATCHER->at ($NEXT_TICK);
2191 or warn "ERROR: unable to write runtime file: $!"; 2436 or warn "ERROR: unable to write runtime file: $!";
2192 })->(); 2437 })->();
2193 }, 2438 },
2194); 2439);
2195 2440
2441END { cf::emergency_save }
2442
21961 24431
2197 2444

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines