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.127 by root, Wed Jan 3 00:05:26 2007 UTC vs.
Revision 1.182 by root, Fri Jan 19 15:38:01 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 path $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
1148 # mit "rum" bekleckern, nicht 1126 # mit "rum" bekleckern, nicht
1149 cf::map::_create_random_map 1127 $self->_create_random_map (
1150 $path,
1151 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1128 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1152 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1129 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1153 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1130 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1154 $rmp->{exit_on_final_map}, 1131 $rmp->{exit_on_final_map},
1155 $rmp->{xsize}, $rmp->{ysize}, 1132 $rmp->{xsize}, $rmp->{ysize},
1156 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1133 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1157 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1134 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1158 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1135 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1159 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1136 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1160 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1161 (cf::region::find $rmp->{region}) 1138 (cf::region::find $rmp->{region}), $rmp->{custom}
1139 )
1140}
1141
1142sub register {
1143 my (undef, $regex) = @_;
1144 my $pkg = caller;
1145
1146 no strict;
1147 push @{"$pkg\::ISA"}, __PACKAGE__;
1148
1149 $EXT_MAP{$pkg} = qr<$regex>;
1150}
1151
1152# also paths starting with '/'
1153$EXT_MAP{"cf::map"} = qr{^(?=/)};
1154
1155sub thawer_merge {
1156 my ($self, $merge) = @_;
1157
1158 # we have to keep some variables in memory intact
1159 local $self->{path};
1160 local $self->{load_path};
1161 local $self->{deny_save};
1162 local $self->{deny_reset};
1163
1164 $self->SUPER::thawer_merge ($merge);
1165}
1166
1167sub normalise {
1168 my ($path, $base) = @_;
1169
1170 # map plan:
1171 #
1172 # /! non-realised random map exit (special hack!)
1173 # {... are special paths that are not being touched
1174 # ?xxx/... are special absolute paths
1175 # ?random/... random maps
1176 # /... normal maps
1177 # ~user/... per-player map of a specific user
1178
1179 $path =~ s/$PATH_SEP/\//go;
1180
1181 # treat it as relative path if it starts with
1182 # something that looks reasonable
1183 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1184 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1185
1186 $base =~ s{[^/]+/?$}{};
1187 $path = "$base/$path";
1188 }
1189
1190 for ($path) {
1191 redo if s{//}{/};
1192 redo if s{/\.?/}{/};
1193 redo if s{/[^/]+/\.\./}{/};
1194 }
1195
1196 $path
1197}
1198
1199sub new_from_path {
1200 my (undef, $path, $base) = @_;
1201
1202 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1203
1204 $path = normalise $path, $base;
1205
1206 for my $pkg (keys %EXT_MAP) {
1207 if ($path =~ $EXT_MAP{$pkg}) {
1208 my $self = bless cf::map::new, $pkg;
1209 $self->{path} = $path; $self->path ($path);
1210 $self->init; # pass $1 etc.
1211 return $self;
1212 }
1213 }
1214
1215 Carp::carp "unable to resolve path '$path'.";
1216 ()
1217}
1218
1219sub init {
1220 my ($self) = @_;
1221
1222 $self
1223}
1224
1225sub as_string {
1226 my ($self) = @_;
1227
1228 "$self->{path}"
1229}
1230
1231# the displayed name, this is a one way mapping
1232sub visible_name {
1233 &as_string
1234}
1235
1236# the original (read-only) location
1237sub load_path {
1238 my ($self) = @_;
1239
1240 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
1241}
1242
1243# the temporary/swap location
1244sub save_path {
1245 my ($self) = @_;
1246
1247 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1248 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
1249}
1250
1251# the unique path, undef == no special unique path
1252sub uniq_path {
1253 my ($self) = @_;
1254
1255 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1256 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1162} 1257}
1163 1258
1164# and all this just because we cannot iterate over 1259# and all this just because we cannot iterate over
1165# all maps in C++... 1260# all maps in C++...
1166sub change_all_map_light { 1261sub change_all_map_light {
1168 1263
1169 $_->change_map_light ($change) 1264 $_->change_map_light ($change)
1170 for grep $_->outdoor, values %cf::MAP; 1265 for grep $_->outdoor, values %cf::MAP;
1171} 1266}
1172 1267
1268sub unlink_save {
1269 my ($self) = @_;
1270
1271 utf8::encode (my $save = $self->save_path);
1272 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1273 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1274}
1275
1173sub try_load_header($) { 1276sub load_header_from($) {
1174 my ($path) = @_; 1277 my ($self, $path) = @_;
1175 1278
1176 utf8::encode $path; 1279 utf8::encode $path;
1177 aio_open $path, O_RDONLY, 0 1280 aio_open $path, O_RDONLY, 0
1178 or return; 1281 or return;
1179 1282
1180 my $map = cf::map::new 1283 $self->_load_header ($path)
1181 or return; 1284 or return;
1182 1285
1183 $map->load_header ($path) 1286 $self->{load_path} = $path;
1287
1288 1
1289}
1290
1291sub load_orig {
1292 my ($self) = @_;
1293
1294 $self->load_header_from ($self->load_path)
1295}
1296
1297sub load_temp {
1298 my ($self) = @_;
1299
1300 $self->load_header_from ($self->save_path)
1301}
1302
1303sub load_header {
1304 my ($self) = @_;
1305
1306 if ($self->load_temp) {
1307 $self->last_access ((delete $self->{last_access})
1308 || $cf::RUNTIME); #d#
1309 # safety
1310 $self->{instantiate_time} = $cf::RUNTIME
1311 if $self->{instantiate_time} > $cf::RUNTIME;
1312 } else {
1313 $self->load_orig
1184 or return; 1314 or return;
1185 1315
1186 $map->{load_path} = $path; 1316 $self->{load_original} = 1;
1317 $self->{instantiate_time} = $cf::RUNTIME;
1318 $self->last_access ($cf::RUNTIME);
1319 $self->instantiate;
1320 }
1187 1321
1188 $map 1322 1
1189} 1323}
1190 1324
1191sub find_map; 1325sub find;
1192sub find_map { 1326sub find {
1193 my ($path, $origin) = @_; 1327 my ($path, $origin) = @_;
1194 1328
1195 #warn "find_map<$path,$origin>\n";#d#
1196
1197 $path = new cf::path $path, $origin && $origin->path; 1329 $path = normalise $path, $origin && $origin->path;
1198 my $key = $path->as_string;
1199 1330
1200 cf::lock_wait "map_find:$key"; 1331 cf::lock_wait "map_find:$path";
1201 1332
1202 $cf::MAP{$key} || do { 1333 $cf::MAP{$path} || do {
1203 my $guard = cf::lock_acquire "map_find:$key"; 1334 my $guard = cf::lock_acquire "map_find:$path";
1204 1335 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; 1336 or return;
1220 1337
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; 1338 $map->{last_save} = $cf::RUNTIME;
1232 $map->last_access ($cf::RUNTIME); 1339
1340 $map->load_header
1341 or return;
1233 1342
1234 if ($map->should_reset) { 1343 if ($map->should_reset) {
1344 $cf::WAIT_FOR_TICK->wait;
1235 $map->reset; 1345 $map->reset;
1236 undef $guard; 1346 undef $guard;
1237 $map = find_map $path 1347 $map = find $path
1238 or return; 1348 or return;
1239 } 1349 }
1240 1350
1241 $cf::MAP{$key} = $map 1351 $cf::MAP{$path} = $map
1242 } 1352 }
1243} 1353}
1244 1354
1245sub load { 1355sub load {
1246 my ($self) = @_; 1356 my ($self) = @_;
1247 1357
1248 my $path = $self->{path}; 1358 my $path = $self->{path};
1249 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1359 my $guard = cf::lock_acquire "map_load:$path";
1250 1360
1251 return if $self->in_memory != cf::MAP_SWAPPED; 1361 return if $self->in_memory != cf::MAP_SWAPPED;
1252 1362
1253 $self->in_memory (cf::MAP_LOADING); 1363 $self->in_memory (cf::MAP_LOADING);
1254 1364
1255 $self->alloc; 1365 $self->alloc;
1256 $self->load_objects ($self->{load_path}, 1) 1366 $self->_load_objects ($self->{load_path}, 1)
1257 or return; 1367 or return;
1258 1368
1259 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1369 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1260 if delete $self->{load_original}; 1370 if delete $self->{load_original};
1261 1371
1262 if (my $uniq = $path->uniq_path) { 1372 if (my $uniq = $self->uniq_path) {
1263 utf8::encode $uniq; 1373 utf8::encode $uniq;
1264 if (aio_open $uniq, O_RDONLY, 0) { 1374 if (aio_open $uniq, O_RDONLY, 0) {
1265 $self->clear_unique_items; 1375 $self->clear_unique_items;
1266 $self->load_objects ($uniq, 0); 1376 $self->_load_objects ($uniq, 0);
1267 } 1377 }
1268 } 1378 }
1379
1380 Coro::cede;
1269 1381
1270 # now do the right thing for maps 1382 # now do the right thing for maps
1271 $self->link_multipart_objects; 1383 $self->link_multipart_objects;
1272 1384
1273 if ($self->{path}->is_style_map) { 1385 unless ($self->{deny_activate}) {
1274 $self->{deny_save} = 1; 1386 $self->decay_objects;
1275 $self->{deny_reset} = 1;
1276 } else {
1277 $self->fix_auto_apply; 1387 $self->fix_auto_apply;
1278 $self->decay_objects;
1279 $self->update_buttons; 1388 $self->update_buttons;
1389 Coro::cede;
1280 $self->set_darkness_map; 1390 $self->set_darkness_map;
1281 $self->difficulty ($self->estimate_difficulty) 1391 $self->difficulty ($self->estimate_difficulty)
1282 unless $self->difficulty; 1392 unless $self->difficulty;
1393 Coro::cede;
1283 $self->activate; 1394 $self->activate;
1284 } 1395 }
1285 1396
1286 $self->in_memory (cf::MAP_IN_MEMORY); 1397 $self->in_memory (cf::MAP_IN_MEMORY);
1287} 1398}
1288 1399
1289sub load_map_sync { 1400sub customise_for {
1401 my ($self, $ob) = @_;
1402
1403 return find "~" . $ob->name . "/" . $self->{path}
1404 if $self->per_player;
1405
1406 $self
1407}
1408
1409# find and load all maps in the 3x3 area around a map
1410sub load_diag {
1411 my ($map) = @_;
1412
1413 my @diag; # diagonal neighbours
1414
1415 for (0 .. 3) {
1416 my $neigh = $map->tile_path ($_)
1417 or next;
1418 $neigh = find $neigh, $map
1419 or next;
1420 $neigh->load;
1421
1422 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1423 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1424 }
1425
1426 for (@diag) {
1427 my $neigh = find @$_
1428 or next;
1429 $neigh->load;
1430 }
1431}
1432
1433sub find_sync {
1290 my ($path, $origin) = @_; 1434 my ($path, $origin) = @_;
1291 1435
1292 #warn "load_map_sync<$path, $origin>\n";#d# 1436 cf::sync_job { find $path, $origin }
1437}
1293 1438
1294 cf::sync_job { 1439sub do_load_sync {
1295 my $map = cf::map::find_map $path, $origin 1440 my ($map) = @_;
1441
1442 cf::sync_job { $map->load };
1443}
1444
1445our %MAP_PREFETCH;
1446our $MAP_PREFETCHER = Coro::async {
1447 while () {
1448 for my $path (keys %MAP_PREFETCH) {
1449 my $map = find $path
1296 or return; 1450 or next;
1297 $map->load; 1451 $map->load;
1298 $map 1452
1453 delete $MAP_PREFETCH{$path};
1454 }
1455 Coro::schedule;
1299 } 1456 }
1457};
1458
1459sub find_async {
1460 my ($path, $origin) = @_;
1461
1462 $path = normalise $path, $origin && $origin->{path};
1463
1464 if (my $map = $cf::MAP{$path}) {
1465 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1466 }
1467
1468 $MAP_PREFETCH{$path} = 0;
1469 $MAP_PREFETCHER->ready;
1470
1471 ()
1300} 1472}
1301 1473
1302sub save { 1474sub save {
1303 my ($self) = @_; 1475 my ($self) = @_;
1304 1476
1477 my $lock = cf::lock_acquire "map_data:" . $self->path;
1478
1305 $self->{last_save} = $cf::RUNTIME; 1479 $self->{last_save} = $cf::RUNTIME;
1306 1480
1307 return unless $self->dirty; 1481 return unless $self->dirty;
1308 1482
1309 my $save = $self->{path}->save_path; utf8::encode $save; 1483 my $save = $self->save_path; utf8::encode $save;
1310 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1484 my $uniq = $self->uniq_path; utf8::encode $uniq;
1311 1485
1312 $self->{load_path} = $save; 1486 $self->{load_path} = $save;
1313 1487
1314 return if $self->{deny_save}; 1488 return if $self->{deny_save};
1315 1489
1490 local $self->{last_access} = $self->last_access;#d#
1491
1492 cf::async {
1493 $_->contr->save for $self->players;
1494 };
1495
1316 if ($uniq) { 1496 if ($uniq) {
1317 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1497 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1318 $self->save_objects ($uniq, cf::IO_UNIQUES); 1498 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1319 } else { 1499 } else {
1320 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1500 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1321 } 1501 }
1322} 1502}
1323 1503
1324sub swap_out { 1504sub swap_out {
1325 my ($self) = @_; 1505 my ($self) = @_;
1506
1507 # save first because save cedes
1508 $self->save;
1509
1510 my $lock = cf::lock_acquire "map_data:" . $self->path;
1326 1511
1327 return if $self->players; 1512 return if $self->players;
1328 return if $self->in_memory != cf::MAP_IN_MEMORY; 1513 return if $self->in_memory != cf::MAP_IN_MEMORY;
1329 return if $self->{deny_save}; 1514 return if $self->{deny_save};
1330 1515
1331 $self->save;
1332 $self->clear; 1516 $self->clear;
1333 $self->in_memory (cf::MAP_SWAPPED); 1517 $self->in_memory (cf::MAP_SWAPPED);
1334} 1518}
1335 1519
1336sub reset_at { 1520sub reset_at {
1337 my ($self) = @_; 1521 my ($self) = @_;
1338 1522
1339 # TODO: safety, remove and allow resettable per-player maps 1523 # TODO: safety, remove and allow resettable per-player maps
1340 return 1e99 if $self->{path}{user_rel}; 1524 return 1e99 if $self->isa ("ext::map_per_player");#d#
1341 return 1e99 if $self->{deny_reset}; 1525 return 1e99 if $self->{deny_reset};
1342 1526
1343 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1527 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1344 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1528 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1345 1529
1350 my ($self) = @_; 1534 my ($self) = @_;
1351 1535
1352 $self->reset_at <= $cf::RUNTIME 1536 $self->reset_at <= $cf::RUNTIME
1353} 1537}
1354 1538
1355sub unlink_save {
1356 my ($self) = @_;
1357
1358 utf8::encode (my $save = $self->{path}->save_path);
1359 aioreq_pri 3; IO::AIO::aio_unlink $save;
1360 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1361}
1362
1363sub rename {
1364 my ($self, $new_path) = @_;
1365
1366 $self->unlink_save;
1367
1368 delete $cf::MAP{$self->path};
1369 $self->{path} = new cf::path $new_path;
1370 $self->path ($self->{path}->as_string);
1371 $cf::MAP{$self->path} = $self;
1372
1373 $self->save;
1374}
1375
1376sub reset { 1539sub reset {
1377 my ($self) = @_; 1540 my ($self) = @_;
1378 1541
1542 my $lock = cf::lock_acquire "map_data:$self->{path}";
1543
1379 return if $self->players; 1544 return if $self->players;
1380 return if $self->{path}{user_rel};#d# 1545 return if $self->isa ("ext::map_per_player");#d#
1381 1546
1382 warn "resetting map ", $self->path;#d# 1547 warn "resetting map ", $self->path;#d#
1383 1548
1384 delete $cf::MAP{$self->path}; 1549 delete $cf::MAP{$self->path};
1550
1551 $self->in_memory (cf::MAP_SWAPPED);
1552 $self->clear;
1385 1553
1386 $_->clear_links_to ($self) for values %cf::MAP; 1554 $_->clear_links_to ($self) for values %cf::MAP;
1387 1555
1388 $self->unlink_save; 1556 $self->unlink_save;
1389 $self->destroy; 1557 $self->destroy;
1392my $nuke_counter = "aaaa"; 1560my $nuke_counter = "aaaa";
1393 1561
1394sub nuke { 1562sub nuke {
1395 my ($self) = @_; 1563 my ($self) = @_;
1396 1564
1565 delete $cf::MAP{$self->path};
1566
1567 $self->unlink_save;
1568
1569 bless $self, "cf::map";
1570 delete $self->{deny_reset};
1397 $self->{deny_save} = 1; 1571 $self->{deny_save} = 1;
1398 $self->reset_timeout (1); 1572 $self->reset_timeout (1);
1399 $self->rename ("{nuke}/" . ($nuke_counter++)); 1573 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1574
1575 $cf::MAP{$self->path} = $self;
1576
1400 $self->reset; # polite request, might not happen 1577 $self->reset; # polite request, might not happen
1401} 1578}
1402 1579
1403sub customise_for { 1580=item cf::map::unique_maps
1404 my ($map, $ob) = @_;
1405 1581
1406 if ($map->per_player) { 1582Returns an arrayref of paths of all shared maps that have
1407 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1583instantiated unique items. May block.
1408 }
1409 1584
1410 $map 1585=cut
1411}
1412 1586
1413sub emergency_save { 1587sub unique_maps() {
1414 local $cf::FREEZE = 1; 1588 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1589 or return;
1415 1590
1416 warn "enter emergency map save\n"; 1591 my @paths;
1417 1592
1418 cf::sync_job { 1593 for (@$files) {
1419 warn "begin emergency map save\n"; 1594 utf8::decode $_;
1420 $_->save for values %cf::MAP; 1595 next if /\.pst$/;
1596 next unless /^$PATH_SEP/o;
1597
1598 s/\.map$//;
1599 push @paths, $_;
1421 }; 1600 }
1422 1601
1423 warn "end emergency map save\n"; 1602 \@paths
1424} 1603}
1425 1604
1426package cf; 1605package cf;
1427 1606
1428=back 1607=back
1429 1608
1609=head3 cf::object
1610
1611=cut
1612
1613package cf::object;
1614
1615=over 4
1616
1617=item $ob->inv_recursive
1618
1619Returns the inventory of the object _and_ their inventories, recursively.
1620
1621=cut
1622
1623sub inv_recursive_;
1624sub inv_recursive_ {
1625 map { $_, inv_recursive_ $_->inv } @_
1626}
1627
1628sub inv_recursive {
1629 inv_recursive_ inv $_[0]
1630}
1631
1632package cf;
1633
1634=back
1430 1635
1431=head3 cf::object::player 1636=head3 cf::object::player
1432 1637
1433=over 4 1638=over 4
1434 1639
1474 1679
1475=item $player_object->enter_link 1680=item $player_object->enter_link
1476 1681
1477Freezes the player and moves him/her to a special map (C<{link}>). 1682Freezes the player and moves him/her to a special map (C<{link}>).
1478 1683
1479The player should be reaosnably safe there for short amounts of time. You 1684The player should be reasonably safe there for short amounts of time. You
1480I<MUST> call C<leave_link> as soon as possible, though. 1685I<MUST> call C<leave_link> as soon as possible, though.
1481 1686
1687Will never block.
1688
1482=item $player_object->leave_link ($map, $x, $y) 1689=item $player_object->leave_link ($map, $x, $y)
1483 1690
1484Moves the player out of the specila link map onto the given map. If the 1691Moves the player out of the special C<{link}> map onto the specified
1485map is not valid (or omitted), the player will be moved back to the 1692map. If the map is not valid (or omitted), the player will be moved back
1486location he/she was before the call to C<enter_link>, or, if that fails, 1693to the location he/she was before the call to C<enter_link>, or, if that
1487to the emergency map position. 1694fails, to the emergency map position.
1488 1695
1489Might block. 1696Might block.
1490 1697
1491=cut 1698=cut
1699
1700sub link_map {
1701 unless ($LINK_MAP) {
1702 $LINK_MAP = cf::map::find "{link}"
1703 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
1704 $LINK_MAP->load;
1705 }
1706
1707 $LINK_MAP
1708}
1492 1709
1493sub cf::object::player::enter_link { 1710sub cf::object::player::enter_link {
1494 my ($self) = @_; 1711 my ($self) = @_;
1495 1712
1496 $self->deactivate_recursive; 1713 $self->deactivate_recursive;
1497 1714
1498 return if $self->map == $LINK_MAP; 1715 return if UNIVERSAL::isa $self->map, "ext::map_link";
1499 1716
1500 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1717 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1501 if $self->map; 1718 if $self->map;
1502 1719
1503 $self->enter_map ($LINK_MAP, 20, 20); 1720 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1504} 1721}
1505 1722
1506sub cf::object::player::leave_link { 1723sub cf::object::player::leave_link {
1507 my ($self, $map, $x, $y) = @_; 1724 my ($self, $map, $x, $y) = @_;
1508 1725
1509 my $link_pos = delete $self->{_link_pos}; 1726 my $link_pos = delete $self->{_link_pos};
1510 1727
1511 unless ($map) { 1728 unless ($map) {
1512 # restore original map position 1729 # restore original map position
1513 ($map, $x, $y) = @{ $link_pos || [] }; 1730 ($map, $x, $y) = @{ $link_pos || [] };
1514 $map = cf::map::find_map $map; 1731 $map = cf::map::find $map;
1515 1732
1516 unless ($map) { 1733 unless ($map) {
1517 ($map, $x, $y) = @$EMERGENCY_POSITION; 1734 ($map, $x, $y) = @$EMERGENCY_POSITION;
1518 $map = cf::map::find_map $map 1735 $map = cf::map::find $map
1519 or die "FATAL: cannot load emergency map\n"; 1736 or die "FATAL: cannot load emergency map\n";
1520 } 1737 }
1521 } 1738 }
1522 1739
1523 ($x, $y) = (-1, -1) 1740 ($x, $y) = (-1, -1)
1526 # use -1 or undef as default coordinates, not 0, 0 1743 # use -1 or undef as default coordinates, not 0, 0
1527 ($x, $y) = ($map->enter_x, $map->enter_y) 1744 ($x, $y) = ($map->enter_x, $map->enter_y)
1528 if $x <=0 && $y <= 0; 1745 if $x <=0 && $y <= 0;
1529 1746
1530 $map->load; 1747 $map->load;
1748 $map->load_diag;
1531 1749
1750 return unless $self->contr->active;
1532 $self->activate_recursive; 1751 $self->activate_recursive;
1533 $self->enter_map ($map, $x, $y); 1752 $self->enter_map ($map, $x, $y);
1534} 1753}
1535 1754
1536cf::player->attach ( 1755cf::player->attach (
1549 1768
1550 # try to abort aborted map switching on player login :) 1769 # try to abort aborted map switching on player login :)
1551 # should happen only on crashes 1770 # should happen only on crashes
1552 if ($pl->ob->{_link_pos}) { 1771 if ($pl->ob->{_link_pos}) {
1553 $pl->ob->enter_link; 1772 $pl->ob->enter_link;
1554 cf::async { 1773 (async {
1555 # we need this sleep as the login has a concurrent enter_exit running 1774 # we need this sleep as the login has a concurrent enter_exit running
1556 # and this sleep increases chances of the player not ending up in scorn 1775 # and this sleep increases chances of the player not ending up in scorn
1776 $pl->ob->reply (undef,
1777 "There was an internal problem at your last logout, "
1778 . "the server will try to bring you to your intended destination in a second.",
1779 cf::NDI_RED);
1557 Coro::Timer::sleep 1; 1780 Coro::Timer::sleep 1;
1558 $pl->ob->leave_link; 1781 $pl->ob->leave_link;
1559 }; 1782 })->prio (2);
1560 } 1783 }
1561 }, 1784 },
1562); 1785);
1563 1786
1564=item $player_object->goto_map ($path, $x, $y) 1787=item $player_object->goto ($path, $x, $y)
1565 1788
1566=cut 1789=cut
1567 1790
1568sub cf::object::player::goto_map { 1791sub cf::object::player::goto {
1569 my ($self, $path, $x, $y) = @_; 1792 my ($self, $path, $x, $y) = @_;
1570 1793
1571 $self->enter_link; 1794 $self->enter_link;
1572 1795
1573 (cf::async { 1796 (async {
1574 $path = new cf::path $path;
1575
1576 my $map = cf::map::find_map $path->as_string; 1797 my $map = cf::map::find $path;
1577 $map = $map->customise_for ($self) if $map; 1798 $map = $map->customise_for ($self) if $map;
1578 1799
1579# warn "entering ", $map->path, " at ($x, $y)\n" 1800# warn "entering ", $map->path, " at ($x, $y)\n"
1580# if $map; 1801# if $map;
1581 1802
1582 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1803 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1583 1804
1584 $self->leave_link ($map, $x, $y); 1805 $self->leave_link ($map, $x, $y);
1585 })->prio (1); 1806 })->prio (1);
1586} 1807}
1587 1808
1591 1812
1592sub parse_random_map_params { 1813sub parse_random_map_params {
1593 my ($spec) = @_; 1814 my ($spec) = @_;
1594 1815
1595 my $rmp = { # defaults 1816 my $rmp = { # defaults
1596 xsize => 10, 1817 xsize => (cf::rndm 15, 40),
1597 ysize => 10, 1818 ysize => (cf::rndm 15, 40),
1819 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1820 #layout => string,
1598 }; 1821 };
1599 1822
1600 for (split /\n/, $spec) { 1823 for (split /\n/, $spec) {
1601 my ($k, $v) = split /\s+/, $_, 2; 1824 my ($k, $v) = split /\s+/, $_, 2;
1602 1825
1606 $rmp 1829 $rmp
1607} 1830}
1608 1831
1609sub prepare_random_map { 1832sub prepare_random_map {
1610 my ($exit) = @_; 1833 my ($exit) = @_;
1834
1835 my $guard = cf::lock_acquire "exit_prepare:$exit";
1611 1836
1612 # all this does is basically replace the /! path by 1837 # all this does is basically replace the /! path by
1613 # a new random map path (?random/...) with a seed 1838 # a new random map path (?random/...) with a seed
1614 # that depends on the exit object 1839 # that depends on the exit object
1615 1840
1624 1849
1625 $rmp->{random_seed} ||= $exit->random_seed; 1850 $rmp->{random_seed} ||= $exit->random_seed;
1626 1851
1627 my $data = cf::to_json $rmp; 1852 my $data = cf::to_json $rmp;
1628 my $md5 = Digest::MD5::md5_hex $data; 1853 my $md5 = Digest::MD5::md5_hex $data;
1854 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1629 1855
1630 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1856 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1631 aio_write $fh, 0, (length $data), $data, 0; 1857 aio_write $fh, 0, (length $data), $data, 0;
1858 undef $fh;
1859 aio_rename "$meta~", $meta;
1632 1860
1633 $exit->slaying ("?random/$md5"); 1861 $exit->slaying ("?random/$md5");
1634 $exit->msg (undef); 1862 $exit->msg (undef);
1635 } 1863 }
1636} 1864}
1640 1868
1641 return unless $self->type == cf::PLAYER; 1869 return unless $self->type == cf::PLAYER;
1642 1870
1643 $self->enter_link; 1871 $self->enter_link;
1644 1872
1645 (cf::async { 1873 (async {
1874 $self->deactivate_recursive; # just to be sure
1646 unless (eval { 1875 unless (eval {
1647 prepare_random_map $exit 1876 prepare_random_map $exit
1648 if $exit->slaying eq "/!"; 1877 if $exit->slaying eq "/!";
1649 1878
1650 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1879 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1651 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1880 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1652 1881
1653 1; 1882 1;
1654 }) { 1883 }) {
1655 $self->message ("Something went wrong deep within the crossfire server. " 1884 $self->message ("Something went wrong deep within the crossfire server. "
1656 . "I'll try to bring you back to the map you were before. " 1885 . "I'll try to bring you back to the map you were before. "
1657 . "Please report this to the dungeon master", 1886 . "Please report this to the dungeon master!",
1658 cf::NDI_UNIQUE | cf::NDI_RED); 1887 cf::NDI_UNIQUE | cf::NDI_RED);
1659 1888
1660 warn "ERROR in enter_exit: $@"; 1889 warn "ERROR in enter_exit: $@";
1661 $self->leave_link; 1890 $self->leave_link;
1662 } 1891 }
1713 on_reply => sub { 1942 on_reply => sub {
1714 my ($ns, $msg) = @_; 1943 my ($ns, $msg) = @_;
1715 1944
1716 # this weird shuffling is so that direct followup queries 1945 # this weird shuffling is so that direct followup queries
1717 # get handled first 1946 # get handled first
1718 my $queue = delete $ns->{query_queue}; 1947 my $queue = delete $ns->{query_queue}
1948 or return; # be conservative, not sure how that can happen, but we saw a crash here
1719 1949
1720 (shift @$queue)->[1]->($msg); 1950 (shift @$queue)->[1]->($msg);
1721 1951
1722 push @{ $ns->{query_queue} }, @$queue; 1952 push @{ $ns->{query_queue} }, @$queue;
1723 1953
1729 } 1959 }
1730 } 1960 }
1731 }, 1961 },
1732); 1962);
1733 1963
1734=item $client->coro (\&cb) 1964=item $client->async (\&cb)
1735 1965
1736Create a new coroutine, running the specified callback. The coroutine will 1966Create a new coroutine, running the specified callback. The coroutine will
1737be automatically cancelled when the client gets destroyed (e.g. on logout, 1967be automatically cancelled when the client gets destroyed (e.g. on logout,
1738or loss of connection). 1968or loss of connection).
1739 1969
1740=cut 1970=cut
1741 1971
1742sub cf::client::coro { 1972sub cf::client::async {
1743 my ($self, $cb) = @_; 1973 my ($self, $cb) = @_;
1744 1974
1745 my $coro = &cf::async ($cb); 1975 my $coro = &Coro::async ($cb);
1746 1976
1747 $coro->on_destroy (sub { 1977 $coro->on_destroy (sub {
1748 delete $self->{_coro}{$coro+0}; 1978 delete $self->{_coro}{$coro+0};
1749 }); 1979 });
1750 1980
1985 open my $fh, "<:utf8", cf::confdir . "/config" 2215 open my $fh, "<:utf8", cf::confdir . "/config"
1986 or return; 2216 or return;
1987 2217
1988 local $/; 2218 local $/;
1989 *CFG = YAML::Syck::Load <$fh>; 2219 *CFG = YAML::Syck::Load <$fh>;
2220
2221 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2222
2223 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2224 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2225
2226 if (exists $CFG{mlockall}) {
2227 eval {
2228 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2229 and die "WARNING: m(un)lockall failed: $!\n";
2230 };
2231 warn $@ if $@;
2232 }
1990} 2233}
1991 2234
1992sub main { 2235sub main {
1993 # we must not ever block the main coroutine 2236 # we must not ever block the main coroutine
1994 local $Coro::idle = sub { 2237 local $Coro::idle = sub {
1995 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2238 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1996 (Coro::unblock_sub { 2239 (async {
1997 Event::one_event; 2240 Event::one_event;
1998 })->(); 2241 })->prio (Coro::PRIO_MAX);
1999 }; 2242 };
2000 2243
2001 cfg_load; 2244 cfg_load;
2002 db_load; 2245 db_load;
2003 load_extensions; 2246 load_extensions;
2004 Event::loop; 2247 Event::loop;
2005} 2248}
2006 2249
2007############################################################################# 2250#############################################################################
2008# initialisation 2251# initialisation and cleanup
2252
2253# install some emergency cleanup handlers
2254BEGIN {
2255 for my $signal (qw(INT HUP TERM)) {
2256 Event->signal (
2257 data => WF_AUTOCANCEL,
2258 signal => $signal,
2259 cb => sub {
2260 cf::cleanup "SIG$signal";
2261 },
2262 );
2263 }
2264}
2265
2266sub emergency_save() {
2267 my $freeze_guard = cf::freeze_mainloop;
2268
2269 warn "enter emergency perl save\n";
2270
2271 cf::sync_job {
2272 # use a peculiar iteration method to avoid tripping on perl
2273 # refcount bugs in for. also avoids problems with players
2274 # and maps saved/destroyed asynchronously.
2275 warn "begin emergency player save\n";
2276 for my $login (keys %cf::PLAYER) {
2277 my $pl = $cf::PLAYER{$login} or next;
2278 $pl->valid or next;
2279 $pl->save;
2280 }
2281 warn "end emergency player save\n";
2282
2283 warn "begin emergency map save\n";
2284 for my $path (keys %cf::MAP) {
2285 my $map = $cf::MAP{$path} or next;
2286 $map->valid or next;
2287 $map->save;
2288 }
2289 warn "end emergency map save\n";
2290 };
2291
2292 warn "leave emergency perl save\n";
2293}
2009 2294
2010sub reload() { 2295sub reload() {
2011 # can/must only be called in main 2296 # can/must only be called in main
2012 if ($Coro::current != $Coro::main) { 2297 if ($Coro::current != $Coro::main) {
2013 warn "can only reload from main coroutine\n"; 2298 warn "can only reload from main coroutine\n";
2014 return; 2299 return;
2015 } 2300 }
2016 2301
2017 warn "reloading..."; 2302 warn "reloading...";
2018 2303
2019 local $FREEZE = 1; 2304 warn "freezing server";
2305 my $guard = freeze_mainloop;
2020 cf::emergency_save; 2306 cf::emergency_save;
2307
2308 warn "sync database to disk";
2309 cf::db_sync;
2310 IO::AIO::flush;
2021 2311
2022 eval { 2312 eval {
2023 # if anything goes wrong in here, we should simply crash as we already saved 2313 # if anything goes wrong in here, we should simply crash as we already saved
2024 2314
2025 # cancel all watchers 2315 warn "cancel all watchers";
2026 for (Event::all_watchers) { 2316 for (Event::all_watchers) {
2027 $_->cancel if $_->data & WF_AUTOCANCEL; 2317 $_->cancel if $_->data & WF_AUTOCANCEL;
2028 } 2318 }
2029 2319
2030 # cancel all extension coros 2320 warn "cancel all extension coros";
2031 $_->cancel for values %EXT_CORO; 2321 $_->cancel for values %EXT_CORO;
2032 %EXT_CORO = (); 2322 %EXT_CORO = ();
2033 2323
2324 warn "remove commands";
2325 %COMMAND = ();
2326
2327 warn "remove ext commands";
2328 %EXTCMD = ();
2329
2034 # unload all extensions 2330 warn "unload/nuke all extensions";
2035 for (@exts) { 2331 for my $pkg (@EXTS) {
2036 warn "unloading <$_>"; 2332 warn "... unloading $pkg";
2037 unload_extension $_; 2333
2334 if (my $cb = $pkg->can ("unload")) {
2335 eval {
2336 $cb->($pkg);
2337 1
2338 } or warn "$pkg unloaded, but with errors: $@";
2038 } 2339 }
2039 2340
2341 warn "... nuking $pkg";
2342 Symbol::delete_package $pkg;
2343 }
2344
2040 # unload all modules loaded from $LIBDIR 2345 warn "unload all perl modules loaded from $LIBDIR";
2041 while (my ($k, $v) = each %INC) { 2346 while (my ($k, $v) = each %INC) {
2042 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2347 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2043 2348
2044 warn "removing <$k>"; 2349 warn "removing <$k>";
2045 delete $INC{$k}; 2350 delete $INC{$k};
2052 } 2357 }
2053 2358
2054 Symbol::delete_package $k; 2359 Symbol::delete_package $k;
2055 } 2360 }
2056 2361
2057 # sync database to disk
2058 cf::db_sync;
2059 IO::AIO::flush;
2060
2061 # get rid of safe::, as good as possible 2362 warn "get rid of safe::, as good as possible";
2062 Symbol::delete_package "safe::$_" 2363 Symbol::delete_package "safe::$_"
2063 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2364 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2064 2365
2065 # remove register_script_function callbacks
2066 # TODO
2067
2068 # unload cf.pm "a bit" 2366 warn "unload cf.pm \"a bit\"";
2069 delete $INC{"cf.pm"}; 2367 delete $INC{"cf.pm"};
2070 2368
2071 # don't, removes xs symbols, too, 2369 # don't, removes xs symbols, too,
2072 # and global variables created in xs 2370 # and global variables created in xs
2073 #Symbol::delete_package __PACKAGE__; 2371 #Symbol::delete_package __PACKAGE__;
2074 2372
2075 # reload cf.pm
2076 warn "reloading cf.pm"; 2373 warn "reloading cf.pm";
2077 require cf; 2374 require cf;
2078 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2375 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2079 2376
2080 # load config and database again 2377 warn "load config and database again";
2081 cf::cfg_load; 2378 cf::cfg_load;
2082 cf::db_load; 2379 cf::db_load;
2083 2380
2084 # load extensions
2085 warn "load extensions"; 2381 warn "load extensions";
2086 cf::load_extensions; 2382 cf::load_extensions;
2087 2383
2088 # reattach attachments to objects 2384 warn "reattach attachments to objects/players";
2089 warn "reattach";
2090 _global_reattach; 2385 _global_reattach;
2386 warn "reattach attachments to maps";
2387 reattach $_ for values %MAP;
2091 }; 2388 };
2092 2389
2093 if ($@) { 2390 if ($@) {
2094 warn $@; 2391 warn $@;
2095 warn "error while reloading, exiting."; 2392 warn "error while reloading, exiting.";
2096 exit 1; 2393 exit 1;
2097 } 2394 }
2098 2395
2099 warn "reloaded successfully"; 2396 warn "reloaded";
2100}; 2397};
2101 2398
2102############################################################################# 2399our $RELOAD_WATCHER; # used only during reload
2103
2104unless ($LINK_MAP) {
2105 $LINK_MAP = cf::map::new;
2106
2107 $LINK_MAP->width (41);
2108 $LINK_MAP->height (41);
2109 $LINK_MAP->alloc;
2110 $LINK_MAP->path ("{link}");
2111 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2112 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2113
2114 # dirty hack because... archetypes are not yet loaded
2115 Event->timer (
2116 after => 2,
2117 cb => sub {
2118 $_[0]->w->cancel;
2119
2120 # provide some exits "home"
2121 my $exit = cf::object::new "exit";
2122
2123 $exit->slaying ($EMERGENCY_POSITION->[0]);
2124 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2125 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2126
2127 $LINK_MAP->insert ($exit->clone, 19, 19);
2128 $LINK_MAP->insert ($exit->clone, 19, 20);
2129 $LINK_MAP->insert ($exit->clone, 19, 21);
2130 $LINK_MAP->insert ($exit->clone, 20, 19);
2131 $LINK_MAP->insert ($exit->clone, 20, 21);
2132 $LINK_MAP->insert ($exit->clone, 21, 19);
2133 $LINK_MAP->insert ($exit->clone, 21, 20);
2134 $LINK_MAP->insert ($exit->clone, 21, 21);
2135
2136 $exit->destroy;
2137 });
2138
2139 $LINK_MAP->{deny_save} = 1;
2140 $LINK_MAP->{deny_reset} = 1;
2141
2142 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2143}
2144
2145register "<global>", __PACKAGE__;
2146 2400
2147register_command "reload" => sub { 2401register_command "reload" => sub {
2148 my ($who, $arg) = @_; 2402 my ($who, $arg) = @_;
2149 2403
2150 if ($who->flag (FLAG_WIZ)) { 2404 if ($who->flag (FLAG_WIZ)) {
2151 $who->message ("start of reload."); 2405 $who->message ("reloading server.");
2406
2407 # doing reload synchronously and two reloads happen back-to-back,
2408 # coro crashes during coro_state_free->destroy here.
2409
2410 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub {
2152 reload; 2411 reload;
2153 $who->message ("end of reload."); 2412 undef $RELOAD_WATCHER;
2413 });
2154 } 2414 }
2155}; 2415};
2156 2416
2157unshift @INC, $LIBDIR; 2417unshift @INC, $LIBDIR;
2158 2418
2160 reentrant => 0, 2420 reentrant => 0,
2161 prio => 0, 2421 prio => 0,
2162 at => $NEXT_TICK || $TICK, 2422 at => $NEXT_TICK || $TICK,
2163 data => WF_AUTOCANCEL, 2423 data => WF_AUTOCANCEL,
2164 cb => sub { 2424 cb => sub {
2165 unless ($FREEZE) { 2425 $NOW = Event::time;
2426
2166 cf::server_tick; # one server iteration 2427 cf::server_tick; # one server iteration
2167 $RUNTIME += $TICK; 2428 $RUNTIME += $TICK;
2168 }
2169
2170 $NEXT_TICK += $TICK; 2429 $NEXT_TICK += $TICK;
2430
2431 $WAIT_FOR_TICK->broadcast;
2432 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2171 2433
2172 # if we are delayed by four ticks or more, skip them all 2434 # if we are delayed by four ticks or more, skip them all
2173 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2435 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2174 2436
2175 $TICK_WATCHER->at ($NEXT_TICK); 2437 $TICK_WATCHER->at ($NEXT_TICK);
2177 }, 2439 },
2178); 2440);
2179 2441
2180IO::AIO::max_poll_time $TICK * 0.2; 2442IO::AIO::max_poll_time $TICK * 0.2;
2181 2443
2182Event->io ( 2444$AIO_POLL_WATCHER = Event->io (
2183 fd => IO::AIO::poll_fileno, 2445 fd => IO::AIO::poll_fileno,
2184 poll => 'r', 2446 poll => 'r',
2185 prio => 5, 2447 prio => 5,
2186 data => WF_AUTOCANCEL, 2448 data => WF_AUTOCANCEL,
2187 cb => \&IO::AIO::poll_cb, 2449 cb => \&IO::AIO::poll_cb,
2188); 2450);
2189 2451
2190Event->timer ( 2452$WRITE_RUNTIME_WATCHER = Event->timer (
2191 data => WF_AUTOCANCEL, 2453 data => WF_AUTOCANCEL,
2192 after => 0, 2454 after => 0,
2193 interval => 10, 2455 interval => 10,
2194 cb => sub { 2456 cb => sub {
2195 (Coro::unblock_sub { 2457 (Coro::unblock_sub {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines