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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines