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.373 by root, Sat Sep 15 15:58:06 2007 UTC vs.
Revision 1.444 by root, Mon Sep 8 11:27:25 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Storable; 31use EV;
10use Event;
11use Opcode; 32use Opcode;
12use Safe; 33use Safe;
13use Safe::Hole; 34use Safe::Hole;
35use Storable ();
14 36
15use Coro 3.64 (); 37use Coro ();
16use Coro::State; 38use Coro::State;
17use Coro::Handle; 39use Coro::Handle;
40use Coro::EV;
18use Coro::Event; 41use Coro::AnyEvent;
19use Coro::Timer; 42use Coro::Timer;
20use Coro::Signal; 43use Coro::Signal;
21use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
22use Coro::AIO; 46use Coro::AIO;
47use Coro::BDB 1.6;
23use Coro::Storable; 48use Coro::Storable;
24use Coro::Util (); 49use Coro::Util ();
25 50
26use JSON::XS (); 51use JSON::XS 2.01 ();
27use BDB (); 52use BDB ();
28use Data::Dumper; 53use Data::Dumper;
29use Digest::MD5; 54use Digest::MD5;
30use Fcntl; 55use Fcntl;
31use YAML::Syck (); 56use YAML ();
32use IO::AIO 2.32 (); 57use IO::AIO ();
33use Time::HiRes; 58use Time::HiRes;
34use Compress::LZF; 59use Compress::LZF;
35use Digest::MD5 (); 60use Digest::MD5 ();
61
62AnyEvent::detect;
36 63
37# configure various modules to our taste 64# configure various modules to our taste
38# 65#
39$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 68Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
43$Event::Eval = 1; # no idea why this is required, but it is
44
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47 69
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 71
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 73
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 92our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 94our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
97our %RESOURCE;
75 98
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 101our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 102our $USE_FSYNC = 1; # use fsync to write maps - default off
83 103
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 104our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 105our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 106our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 107our $DB_ENV;
89 108
90our %CFG; 109our %CFG;
91 110
92our $UPTIME; $UPTIME ||= time; 111our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 112our $RUNTIME;
113our $NOW;
94 114
95our (%PLAYER, %PLAYER_LOADING); # all users 115our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 116our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 117our $LINK_MAP; # the special {link} map, which is always available
98 118
99# used to convert map paths into valid unix filenames by replacing / by ∕ 119# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 120our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 121
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 122our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 123our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 125our $TICK_START; # for load detecting purposes
105 126
106binmode STDOUT; 127binmode STDOUT;
107binmode STDERR; 128binmode STDERR;
108 129
109# read virtual server time, if available 130# read virtual server time, if available
162 183
163The raw value load value from the last tick. 184The raw value load value from the last tick.
164 185
165=item %cf::CFG 186=item %cf::CFG
166 187
167Configuration for the server, loaded from C</etc/crossfire/config>, or 188Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 189from wherever your confdir points to.
169 190
170=item cf::wait_for_tick, cf::wait_for_tick_begin 191=item cf::wait_for_tick, cf::wait_for_tick_begin
171 192
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 193These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 214 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 215
195 LOG llevError, $msg; 216 LOG llevError, $msg;
196 }; 217 };
197} 218}
219
220$Coro::State::DIEHOOK = sub {
221 return unless $^S eq 0; # "eq", not "=="
222
223 if ($Coro::current == $Coro::main) {#d#
224 warn "DIEHOOK called in main context, Coro bug?\n";#d#
225 return;#d#
226 }#d#
227
228 # kill coroutine otherwise
229 warn Carp::longmess $_[0];
230 Coro::terminate
231};
232
233$SIG{__DIE__} = sub { }; #d#?
198 234
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 245for my $pkg (qw(
210 cf::global cf::attachable 246 cf::global cf::attachable
211 cf::object cf::object::player 247 cf::object cf::object::player
212 cf::client cf::player 248 cf::client cf::player
213 cf::arch cf::living 249 cf::arch cf::living
250 cf::map cf::mapspace
214 cf::map cf::party cf::region 251 cf::party cf::region
215)) { 252)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 254}
219 255
220$Event::DIED = sub { 256$EV::DIED = sub {
221 warn "error in event callback: @_"; 257 warn "error in event callback: @_";
222}; 258};
223 259
224############################################################################# 260#############################################################################
225 261
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 284 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 285 $d
250 } || "[unable to dump $_[0]: '$@']"; 286 } || "[unable to dump $_[0]: '$@']";
251} 287}
252 288
253=item $ref = cf::from_json $json 289=item $ref = cf::decode_json $json
254 290
255Converts a JSON string into the corresponding perl data structure. 291Converts a JSON string into the corresponding perl data structure.
256 292
257=item $json = cf::to_json $ref 293=item $json = cf::encode_json $ref
258 294
259Converts a perl data structure into its JSON representation. 295Converts a perl data structure into its JSON representation.
260 296
261=cut 297=cut
262 298
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 299our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 300
265sub to_json ($) { $json_coder->encode ($_[0]) } 301sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 302sub decode_json($) { $json_coder->decode ($_[0]) }
267 303
268=item cf::lock_wait $string 304=item cf::lock_wait $string
269 305
270Wait until the given lock is available. See cf::lock_acquire. 306Wait until the given lock is available. See cf::lock_acquire.
271 307
327 363
328 ! ! $LOCK{$key} 364 ! ! $LOCK{$key}
329} 365}
330 366
331sub freeze_mainloop { 367sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
333 369
334 my $guard = Coro::guard { 370 Coro::guard \&tick_inhibit_dec;
335 $TICK_WATCHER->start; 371}
336 }; 372
337 $TICK_WATCHER->stop; 373=item cf::periodic $interval, $cb
338 $guard 374
375Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer.
377
378=cut
379
380sub periodic($$) {
381 my ($interval, $cb) = @_;
382
383 my $start = rand List::Util::min 180, $interval;
384
385 EV::periodic $start, $interval, 0, $cb
339} 386}
340 387
341=item cf::get_slot $time[, $priority[, $name]] 388=item cf::get_slot $time[, $priority[, $name]]
342 389
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 390Allocate $time seconds of blocking CPU time at priority C<$priority>:
354our @SLOT_QUEUE; 401our @SLOT_QUEUE;
355our $SLOT_QUEUE; 402our $SLOT_QUEUE;
356 403
357$SLOT_QUEUE->cancel if $SLOT_QUEUE; 404$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async { 405$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager");
407
359 my $signal = new Coro::Signal; 408 my $signal = new Coro::Signal;
360 409
361 while () { 410 while () {
362 next_job: 411 next_job:
363 my $avail = cf::till_tick; 412 my $avail = cf::till_tick;
371 } 420 }
372 } 421 }
373 } 422 }
374 423
375 if (@SLOT_QUEUE) { 424 if (@SLOT_QUEUE) {
376 # we do not use wait_For_tick() as it returns immediately when tick is inactive 425 # we do not use wait_for_tick() as it returns immediately when tick is inactive
377 push @cf::WAIT_FOR_TICK, $signal; 426 push @cf::WAIT_FOR_TICK, $signal;
378 $signal->wait; 427 $signal->wait;
379 } else { 428 } else {
380 Coro::schedule; 429 Coro::schedule;
381 } 430 }
382 } 431 }
383}; 432};
384 433
385sub get_slot($;$$) { 434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
386 my ($time, $pri, $name) = @_; 437 my ($time, $pri, $name) = @_;
387 438
388 $time = $TICK * .6 if $time > $TICK * .6; 439 $time = $TICK * .6 if $time > $TICK * .6;
389 my $sig = new Coro::Signal; 440 my $sig = new Coro::Signal;
390 441
404 455
405BEGIN { *async = \&Coro::async_pool } 456BEGIN { *async = \&Coro::async_pool }
406 457
407=item cf::sync_job { BLOCK } 458=item cf::sync_job { BLOCK }
408 459
409The design of Crossfire TRT requires that the main coroutine ($Coro::main) 460The design of Deliantra requires that the main coroutine ($Coro::main)
410is always able to handle events or runnable, as Crossfire TRT is only 461is always able to handle events or runnable, as Deliantra is only
411partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 462partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
412acceptable. 463acceptable.
413 464
414If it must be done, put the blocking parts into C<sync_job>. This will run 465If it must be done, put the blocking parts into C<sync_job>. This will run
415the given BLOCK in another coroutine while waiting for the result. The 466the given BLOCK in another coroutine while waiting for the result. The
420 471
421sub sync_job(&) { 472sub sync_job(&) {
422 my ($job) = @_; 473 my ($job) = @_;
423 474
424 if ($Coro::current == $Coro::main) { 475 if ($Coro::current == $Coro::main) {
425 my $time = Event::time; 476 my $time = EV::time;
426 477
427 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
428 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
429 480
430 # TODO: use suspend/resume instead 481 LOG llevError, Carp::longmess "sync job";#d#
431 # (but this is cancel-safe) 482
432 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
433 484
434 my $busy = 1; 485 my $busy = 1;
435 my @res; 486 my @res;
436 487
437 (async { 488 (async {
489 $Coro::current->desc ("sync job coro");
438 @res = eval { $job->() }; 490 @res = eval { $job->() };
439 warn $@ if $@; 491 warn $@ if $@;
440 undef $busy; 492 undef $busy;
441 })->prio (Coro::PRIO_MAX); 493 })->prio (Coro::PRIO_MAX);
442 494
443 while ($busy) { 495 while ($busy) {
444 Coro::cede or Event::one_event; 496 if (Coro::nready) {
497 Coro::cede_notself;
498 } else {
499 EV::loop EV::LOOP_ONESHOT;
445 } 500 }
501 }
446 502
447 $time = Event::time - $time; 503 my $time = EV::time - $time;
448 504
449 LOG llevError | logBacktrace, Carp::longmess "long sync job"
450 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
451
452 $tick_start += $time; # do not account sync jobs to server load 505 $TICK_START += $time; # do not account sync jobs to server load
453 506
454 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
455 } else { 508 } else {
456 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
457 510
482=item fork_call { }, $args 535=item fork_call { }, $args
483 536
484Executes the given code block with the given arguments in a seperate 537Executes the given code block with the given arguments in a seperate
485process, returning the results. Everything must be serialisable with 538process, returning the results. Everything must be serialisable with
486Coro::Storable. May, of course, block. Note that the executed sub may 539Coro::Storable. May, of course, block. Note that the executed sub may
487never block itself or use any form of Event handling. 540never block itself or use any form of event handling.
488 541
489=cut 542=cut
490 543
491sub fork_call(&@) { 544sub fork_call(&@) {
492 my ($cb, @args) = @_; 545 my ($cb, @args) = @_;
499 reset_signals; 552 reset_signals;
500 &$cb 553 &$cb
501 }, @args; 554 }, @args;
502 555
503 wantarray ? @res : $res[-1] 556 wantarray ? @res : $res[-1]
557}
558
559=item $coin = coin_from_name $name
560
561=cut
562
563our %coin_alias = (
564 "silver" => "silvercoin",
565 "silvercoin" => "silvercoin",
566 "silvercoins" => "silvercoin",
567 "gold" => "goldcoin",
568 "goldcoin" => "goldcoin",
569 "goldcoins" => "goldcoin",
570 "platinum" => "platinacoin",
571 "platinumcoin" => "platinacoin",
572 "platinumcoins" => "platinacoin",
573 "platina" => "platinacoin",
574 "platinacoin" => "platinacoin",
575 "platinacoins" => "platinacoin",
576 "royalty" => "royalty",
577 "royalties" => "royalty",
578);
579
580sub coin_from_name($) {
581 $coin_alias{$_[0]}
582 ? cf::arch::find $coin_alias{$_[0]}
583 : undef
504} 584}
505 585
506=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
507 587
508Returns a single value from the environment database. 588Returns a single value from the environment database.
653attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
654to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
655 735
656In the following description, CLASS can be any of C<global>, C<object> 736In the following description, CLASS can be any of C<global>, C<object>
657C<player>, C<client> or C<map> (i.e. the attachable objects in 737C<player>, C<client> or C<map> (i.e. the attachable objects in
658Crossfire TRT). 738Deliantra).
659 739
660=over 4 740=over 4
661 741
662=item $attachable->attach ($attachment, key => $value...) 742=item $attachable->attach ($attachment, key => $value...)
663 743
945 } 1025 }
946 1026
947 0 1027 0
948} 1028}
949 1029
950=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
951 1031
952=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
953 1033
954Generate an object-specific event with the given arguments. 1034Generate an object-specific event with the given arguments.
955 1035
961 1041
962=cut 1042=cut
963 1043
964############################################################################# 1044#############################################################################
965# object support 1045# object support
966#
967 1046
1047sub _object_equal($$);
1048sub _object_equal($$) {
1049 my ($a, $b) = @_;
1050
1051 return 0 unless (ref $a) eq (ref $b);
1052
1053 if ("HASH" eq ref $a) {
1054 my @ka = keys %$a;
1055 my @kb = keys %$b;
1056
1057 return 0 if @ka != @kb;
1058
1059 for (0 .. $#ka) {
1060 return 0 unless $ka[$_] eq $kb[$_];
1061 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1062 }
1063
1064 } elsif ("ARRAY" eq ref $a) {
1065
1066 return 0 if @$a != @$b;
1067
1068 for (0 .. $#$a) {
1069 return 0 unless _object_equal $a->[$_], $b->[$_];
1070 }
1071
1072 } elsif ($a ne $b) {
1073 return 0;
1074 }
1075
1076 1
1077}
1078
1079our $SLOW_MERGES;#d#
968sub _can_merge { 1080sub _can_merge {
969 my ($ob1, $ob2) = @_; 1081 my ($ob1, $ob2) = @_;
970 1082
971 local $Storable::canonical = 1; 1083 ++$SLOW_MERGES;#d#
972 my $fob1 = Storable::freeze $ob1;
973 my $fob2 = Storable::freeze $ob2;
974 1084
975 $fob1 eq $fob2 1085 # we do the slow way here
1086 return _object_equal $ob1, $ob2
976} 1087}
977 1088
978sub reattach { 1089sub reattach {
979 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
980 my ($obj) = @_; 1091 my ($obj) = @_;
981 1092
1093 # no longer needed after getting rid of delete_package?
982 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1094 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
983 1095
984 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
985 1097
986 @$registry = (); 1098 @$registry = ();
987 1099
1002cf::attachable->attach ( 1114cf::attachable->attach (
1003 prio => -1000000, 1115 prio => -1000000,
1004 on_instantiate => sub { 1116 on_instantiate => sub {
1005 my ($obj, $data) = @_; 1117 my ($obj, $data) = @_;
1006 1118
1007 $data = from_json $data; 1119 $data = decode_json $data;
1008 1120
1009 for (@$data) { 1121 for (@$data) {
1010 my ($name, $args) = @$_; 1122 my ($name, $args) = @$_;
1011 1123
1012 $obj->attach ($name, %{$args || {} }); 1124 $obj->attach ($name, %{$args || {} });
1033 utf8::decode (my $decname = $filename); 1145 utf8::decode (my $decname = $filename);
1034 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
1035 $decname, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
1036 1148
1037 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1038 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
1039 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1040 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
1041 close $fh; 1153 aio_close $fh;
1042 1154
1043 if (@$objs) { 1155 if (@$objs) {
1044 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1045 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
1046 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1047 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
1048 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
1049 close $fh; 1161 aio_close $fh;
1050 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
1051 } 1163 }
1052 } else { 1164 } else {
1053 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1054 } 1166 }
1082 1194
1083 unless (aio_stat "$filename.pst") { 1195 unless (aio_stat "$filename.pst") {
1084 (aio_load "$filename.pst", $av) >= 0 1196 (aio_load "$filename.pst", $av) >= 0
1085 or return; 1197 or return;
1086 1198
1087 $av = eval { (Storable::thaw $av)->{objs} }; 1199 my $st = eval { Coro::Storable::thaw $av };
1200 $av = $st->{objs};
1088 } 1201 }
1089 1202
1090 utf8::decode (my $decname = $filename); 1203 utf8::decode (my $decname = $filename);
1091 warn sprintf "loading %s (%d,%d)\n", 1204 warn sprintf "loading %s (%d,%d)\n",
1092 $decname, length $data, scalar @{$av || []}; 1205 $decname, length $data, scalar @{$av || []};
1222 1335
1223 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1224 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1225 1338
1226 $ext{source} = 1339 $ext{source} =
1227 "package $pkg; use strict; use utf8;\n" 1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1228 . "#line 1 \"$path\"\n{\n" 1341 . "#line 1 \"$path\"\n{\n"
1229 . $source 1342 . $source
1230 . "\n};\n1"; 1343 . "\n};\n1";
1231 1344
1232 $todo{$base} = \%ext; 1345 $todo{$base} = \%ext;
1248 my $msg = $@ ? "$v->{path}: $@\n" 1361 my $msg = $@ ? "$v->{path}: $@\n"
1249 : "$v->{base}: extension inactive.\n"; 1362 : "$v->{base}: extension inactive.\n";
1250 1363
1251 if (exists $v->{meta}{mandatory}) { 1364 if (exists $v->{meta}{mandatory}) {
1252 warn $msg; 1365 warn $msg;
1253 warn "mandatory extension failed to load, exiting.\n"; 1366 cf::cleanup "mandatory extension failed to load, exiting.";
1254 exit 1;
1255 } 1367 }
1256 1368
1257 warn $msg; 1369 warn $msg;
1258 } 1370 }
1259 1371
1348 my $f = new_from_file cf::object::thawer path $login 1460 my $f = new_from_file cf::object::thawer path $login
1349 or return; 1461 or return;
1350 1462
1351 my $pl = cf::player::load_pl $f 1463 my $pl = cf::player::load_pl $f
1352 or return; 1464 or return;
1465
1353 local $cf::PLAYER_LOADING{$login} = $pl; 1466 local $cf::PLAYER_LOADING{$login} = $pl;
1354 $f->resolve_delayed_derefs; 1467 $f->resolve_delayed_derefs;
1355 $cf::PLAYER{$login} = $pl 1468 $cf::PLAYER{$login} = $pl
1356 } 1469 }
1357 } 1470 }
1367 1480
1368 return if $pl->{deny_save}; 1481 return if $pl->{deny_save};
1369 1482
1370 aio_mkdir playerdir $pl, 0770; 1483 aio_mkdir playerdir $pl, 0770;
1371 $pl->{last_save} = $cf::RUNTIME; 1484 $pl->{last_save} = $cf::RUNTIME;
1485
1486 cf::get_slot 0.01;
1372 1487
1373 $pl->save_pl ($path); 1488 $pl->save_pl ($path);
1374 cf::cede_to_tick; 1489 cf::cede_to_tick;
1375} 1490}
1376 1491
1408 my ($pl) = @_; 1523 my ($pl) = @_;
1409 1524
1410 my $name = $pl->ob->name; 1525 my $name = $pl->ob->name;
1411 1526
1412 $pl->{deny_save} = 1; 1527 $pl->{deny_save} = 1;
1413 $pl->password ("*"); # this should lock out the player until we nuked the dir 1528 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1414 1529
1415 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1416 $pl->deactivate; 1531 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1417 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1534 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1418 $pl->ns->destroy if $pl->ns; 1535 $pl->ns->destroy if $pl->ns;
1419 1536
1420 my $path = playerdir $pl; 1537 my $path = playerdir $pl;
1421 my $temp = "$path~$cf::RUNTIME~deleting~"; 1538 my $temp = "$path~$cf::RUNTIME~deleting~";
1460 1577
1461 for my $login (@$dirs) { 1578 for my $login (@$dirs) {
1462 my $path = path $login; 1579 my $path = path $login;
1463 1580
1464 # a .pst is a dead give-away for a valid player 1581 # a .pst is a dead give-away for a valid player
1465 unless (-e "$path.pst") { 1582 # if no pst file found, open and chekc for blocked users
1583 if (aio_stat "$path.pst") {
1466 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1584 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1467 aio_read $fh, 0, 512, my $buf, 0 or next; 1585 aio_read $fh, 0, 512, my $buf, 0 or next;
1468 $buf !~ /^password -------------$/m or next; # official not-valid tag 1586 $buf !~ /^password -------------$/m or next; # official not-valid tag
1469 } 1587 }
1470 1588
1505 1623
1506=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1624=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1507 1625
1508Expand crossfire pod fragments into protocol xml. 1626Expand crossfire pod fragments into protocol xml.
1509 1627
1510=cut
1511
1512sub expand_cfpod {
1513 ((my $self), (local $_)) = @_;
1514
1515 # escape & and <
1516 s/&/&amp;/g;
1517 s/(?<![BIUGHT])</&lt;/g;
1518
1519 # this is buggy, it needs to properly take care of nested <'s
1520
1521 1 while
1522 # replace B<>, I<>, U<> etc.
1523 s/B<([^\>]*)>/<b>$1<\/b>/
1524 || s/I<([^\>]*)>/<i>$1<\/i>/
1525 || s/U<([^\>]*)>/<u>$1<\/u>/
1526 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1527 # replace G<male|female> tags
1528 || s{G<([^>|]*)\|([^>]*)>}{
1529 $self->gender ? $2 : $1
1530 }ge
1531 # replace H<hint text>
1532 || s{H<([^\>]*)>}
1533 {
1534 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1535 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1536 "")
1537 [$self->{hintmode}]
1538 }ge;
1539
1540 # create single paragraphs (very hackish)
1541 s/(?<=\S)\n(?=\w)/ /g;
1542
1543 # compress some whitespace
1544 s/\s+\n/\n/g; # ws line-ends
1545 s/\n\n+/\n/g; # double lines
1546 s/^\n+//; # beginning lines
1547 s/\n+$//; # ending lines
1548
1549 $_
1550}
1551
1552sub hintmode {
1553 $_[0]{hintmode} = $_[1] if @_ > 1;
1554 $_[0]{hintmode}
1555}
1556
1557=item $player->ext_reply ($msgid, @msg) 1628=item $player->ext_reply ($msgid, @msg)
1558 1629
1559Sends an ext reply to the player. 1630Sends an ext reply to the player.
1560 1631
1561=cut 1632=cut
1627our $MAX_RESET = 3600; 1698our $MAX_RESET = 3600;
1628our $DEFAULT_RESET = 3000; 1699our $DEFAULT_RESET = 3000;
1629 1700
1630sub generate_random_map { 1701sub generate_random_map {
1631 my ($self, $rmp) = @_; 1702 my ($self, $rmp) = @_;
1703
1704 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1705
1632 # mit "rum" bekleckern, nicht 1706 # mit "rum" bekleckern, nicht
1633 $self->_create_random_map ( 1707 $self->_create_random_map (
1634 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1708 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1635 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1709 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1636 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1710 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1758 1832
1759# the temporary/swap location 1833# the temporary/swap location
1760sub save_path { 1834sub save_path {
1761 my ($self) = @_; 1835 my ($self) = @_;
1762 1836
1763 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1837 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1764 "$TMPDIR/$path.map" 1838 "$TMPDIR/$path.map"
1765} 1839}
1766 1840
1767# the unique path, undef == no special unique path 1841# the unique path, undef == no special unique path
1768sub uniq_path { 1842sub uniq_path {
1769 my ($self) = @_; 1843 my ($self) = @_;
1770 1844
1771 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1845 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1772 "$UNIQUEDIR/$path" 1846 "$UNIQUEDIR/$path"
1773} 1847}
1774 1848
1775# and all this just because we cannot iterate over 1849# and all this just because we cannot iterate over
1776# all maps in C++... 1850# all maps in C++...
1874 1948
1875 cf::lock_wait "map_data:$path";#d#remove 1949 cf::lock_wait "map_data:$path";#d#remove
1876 cf::lock_wait "map_find:$path"; 1950 cf::lock_wait "map_find:$path";
1877 1951
1878 $cf::MAP{$path} || do { 1952 $cf::MAP{$path} || do {
1879 my $guard1 = cf::lock_acquire "map_find:$path";
1880 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 1953 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1954 my $guard2 = cf::lock_acquire "map_find:$path";
1881 1955
1882 my $map = new_from_path cf::map $path 1956 my $map = new_from_path cf::map $path
1883 or return; 1957 or return;
1884 1958
1885 $map->{last_save} = $cf::RUNTIME; 1959 $map->{last_save} = $cf::RUNTIME;
1888 or return; 1962 or return;
1889 1963
1890 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1964 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1891 # doing this can freeze the server in a sync job, obviously 1965 # doing this can freeze the server in a sync job, obviously
1892 #$cf::WAIT_FOR_TICK->wait; 1966 #$cf::WAIT_FOR_TICK->wait;
1967 undef $guard2;
1893 undef $guard1; 1968 undef $guard1;
1894 undef $guard2;
1895 $map->reset; 1969 $map->reset;
1896 return find $path; 1970 return find $path;
1897 } 1971 }
1898 1972
1899 $cf::MAP{$path} = $map 1973 $cf::MAP{$path} = $map
1926 my $f = new_from_file cf::object::thawer $self->{load_path}; 2000 my $f = new_from_file cf::object::thawer $self->{load_path};
1927 $f->skip_block; 2001 $f->skip_block;
1928 $self->_load_objects ($f) 2002 $self->_load_objects ($f)
1929 or return; 2003 or return;
1930 2004
1931 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2005 $self->post_load_original
1932 if delete $self->{load_original}; 2006 if delete $self->{load_original};
1933 2007
1934 if (my $uniq = $self->uniq_path) { 2008 if (my $uniq = $self->uniq_path) {
1935 utf8::encode $uniq; 2009 utf8::encode $uniq;
1936 unless (aio_stat $uniq) { 2010 unless (aio_stat $uniq) {
1962 } 2036 }
1963 2037
1964 $self->{last_save} = $cf::RUNTIME; 2038 $self->{last_save} = $cf::RUNTIME;
1965 $self->last_access ($cf::RUNTIME); 2039 $self->last_access ($cf::RUNTIME);
1966 2040
1967 $self->in_memory (cf::MAP_IN_MEMORY); 2041 $self->in_memory (cf::MAP_ACTIVE);
1968 } 2042 }
1969 2043
1970 $self->post_load; 2044 $self->post_load;
1971} 2045}
1972 2046
2030 my ($path, $origin, $load) = @_; 2104 my ($path, $origin, $load) = @_;
2031 2105
2032 $path = normalise $path, $origin && $origin->{path}; 2106 $path = normalise $path, $origin && $origin->{path};
2033 2107
2034 if (my $map = $cf::MAP{$path}) { 2108 if (my $map = $cf::MAP{$path}) {
2035 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2109 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2036 } 2110 }
2037 2111
2038 $MAP_PREFETCH{$path} |= $load; 2112 $MAP_PREFETCH{$path} |= $load;
2039 2113
2040 $MAP_PREFETCHER ||= cf::async { 2114 $MAP_PREFETCHER ||= cf::async {
2115 $Coro::current->{desc} = "map prefetcher";
2116
2041 while (%MAP_PREFETCH) { 2117 while (%MAP_PREFETCH) {
2042 while (my ($k, $v) = each %MAP_PREFETCH) { 2118 while (my ($k, $v) = each %MAP_PREFETCH) {
2043 if (my $map = find $k) { 2119 if (my $map = find $k) {
2044 $map->load if $v; 2120 $map->load if $v;
2045 } 2121 }
2071 return if $self->{deny_save}; 2147 return if $self->{deny_save};
2072 2148
2073 local $self->{last_access} = $self->last_access;#d# 2149 local $self->{last_access} = $self->last_access;#d#
2074 2150
2075 cf::async { 2151 cf::async {
2152 $Coro::current->{desc} = "map player save";
2076 $_->contr->save for $self->players; 2153 $_->contr->save for $self->players;
2077 }; 2154 };
2155
2156 cf::get_slot 0.02;
2078 2157
2079 if ($uniq) { 2158 if ($uniq) {
2080 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2159 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2081 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2160 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2082 } else { 2161 } else {
2091 $self->save; 2170 $self->save;
2092 2171
2093 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2172 my $lock = cf::lock_acquire "map_data:$self->{path}";
2094 2173
2095 return if $self->players; 2174 return if $self->players;
2096 return if $self->in_memory != cf::MAP_IN_MEMORY; 2175 return if $self->in_memory != cf::MAP_ACTIVE;
2097 return if $self->{deny_save}; 2176 return if $self->{deny_save};
2098 2177
2099 $self->in_memory (cf::MAP_SWAPPED); 2178 $self->in_memory (cf::MAP_SWAPPED);
2100 2179
2101 $self->deactivate; 2180 $self->deactivate;
2219 2298
2220sub unique_maps() { 2299sub unique_maps() {
2221 [ 2300 [
2222 map { 2301 map {
2223 utf8::decode $_; 2302 utf8::decode $_;
2224 /\.map$/ 2303 s/\.map$//; # TODO future compatibility hack
2304 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2305 ? ()
2225 ? normalise $_ 2306 : normalise $_
2226 : ()
2227 } @{ aio_readdir $UNIQUEDIR or [] } 2307 } @{ aio_readdir $UNIQUEDIR or [] }
2228 ] 2308 ]
2229} 2309}
2230 2310
2231package cf;
2232
2233=back 2311=back
2234 2312
2235=head3 cf::object 2313=head3 cf::object
2236 2314
2237=cut 2315=cut
2240 2318
2241=over 4 2319=over 4
2242 2320
2243=item $ob->inv_recursive 2321=item $ob->inv_recursive
2244 2322
2245Returns the inventory of the object _and_ their inventories, recursively. 2323Returns the inventory of the object I<and> their inventories, recursively,
2324but I<not> the object itself.
2246 2325
2247=cut 2326=cut
2248 2327
2249sub inv_recursive_; 2328sub inv_recursive_;
2250sub inv_recursive_ { 2329sub inv_recursive_ {
2255 inv_recursive_ inv $_[0] 2334 inv_recursive_ inv $_[0]
2256} 2335}
2257 2336
2258=item $ref = $ob->ref 2337=item $ref = $ob->ref
2259 2338
2260creates and returns a persistent reference to an objetc that can be stored as a string. 2339Creates and returns a persistent reference to an object that can be stored as a string.
2261 2340
2262=item $ob = cf::object::deref ($refstring) 2341=item $ob = cf::object::deref ($refstring)
2263 2342
2264returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2343returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2265even if the object actually exists. May block. 2344even if the object actually exists. May block.
2267=cut 2346=cut
2268 2347
2269sub deref { 2348sub deref {
2270 my ($ref) = @_; 2349 my ($ref) = @_;
2271 2350
2272 # temporary compatibility#TODO#remove
2273 $ref =~ s{^<}{player/<};
2274
2275 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2351 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2276 my ($uuid, $name) = ($1, $2); 2352 my ($uuid, $name) = ($1, $2);
2277 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2353 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2278 or return; 2354 or return;
2279 $pl->ob->uuid eq $uuid 2355 $pl->ob->uuid eq $uuid
2280 or return; 2356 or return;
2300can be C<undef>. Does the right thing when the player is currently in a 2376can be C<undef>. Does the right thing when the player is currently in a
2301dialogue with the given NPC character. 2377dialogue with the given NPC character.
2302 2378
2303=cut 2379=cut
2304 2380
2381our $SAY_CHANNEL = {
2382 id => "say",
2383 title => "Map",
2384 reply => "say ",
2385 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2386};
2387
2388our $CHAT_CHANNEL = {
2389 id => "chat",
2390 title => "Chat",
2391 reply => "chat ",
2392 tooltip => "Player chat and shouts, global to the server.",
2393};
2394
2305# rough implementation of a future "reply" method that works 2395# rough implementation of a future "reply" method that works
2306# with dialog boxes. 2396# with dialog boxes.
2307#TODO: the first argument must go, split into a $npc->reply_to ( method 2397#TODO: the first argument must go, split into a $npc->reply_to ( method
2308sub cf::object::player::reply($$$;$) { 2398sub cf::object::player::reply($$$;$) {
2309 my ($self, $npc, $msg, $flags) = @_; 2399 my ($self, $npc, $msg, $flags) = @_;
2320 my $dialog = $pl->{npc_dialog}; 2410 my $dialog = $pl->{npc_dialog};
2321 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2411 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2322 2412
2323 } else { 2413 } else {
2324 $msg = $npc->name . " says: $msg" if $npc; 2414 $msg = $npc->name . " says: $msg" if $npc;
2325 $self->message ($msg, $flags); 2415 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2326 } 2416 }
2327 } 2417 }
2328} 2418}
2329 2419
2330=item $object->send_msg ($channel, $msg, $color, [extra...]) 2420=item $object->send_msg ($channel, $msg, $color, [extra...])
2438her, loading and preparing them map, calling the provided $check callback 2528her, loading and preparing them map, calling the provided $check callback
2439that has to return the map if sucecssful, and then unfreezes the player on 2529that has to return the map if sucecssful, and then unfreezes the player on
2440the new (success) or old (failed) map position. In either case, $done will 2530the new (success) or old (failed) map position. In either case, $done will
2441be called at the end of this process. 2531be called at the end of this process.
2442 2532
2533Note that $check will be called with a potentially non-loaded map, so if
2534it needs a loaded map it has to call C<< ->load >>.
2535
2443=cut 2536=cut
2444 2537
2445our $GOTOGEN; 2538our $GOTOGEN;
2446 2539
2447sub cf::object::player::goto { 2540sub cf::object::player::goto {
2451 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2544 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2452 2545
2453 $self->enter_link; 2546 $self->enter_link;
2454 2547
2455 (async { 2548 (async {
2549 $Coro::current->{desc} = "player::goto $path $x $y";
2550
2456 # *tag paths override both path and x|y 2551 # *tag paths override both path and x|y
2457 if ($path =~ /^\*(.*)$/) { 2552 if ($path =~ /^\*(.*)$/) {
2458 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2553 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2459 my $ob = $obs[rand @obs]; 2554 my $ob = $obs[rand @obs];
2460 2555
2523} 2618}
2524 2619
2525sub prepare_random_map { 2620sub prepare_random_map {
2526 my ($exit) = @_; 2621 my ($exit) = @_;
2527 2622
2528 my $guard = cf::lock_acquire "exit_prepare:$exit";
2529
2530 # all this does is basically replace the /! path by 2623 # all this does is basically replace the /! path by
2531 # a new random map path (?random/...) with a seed 2624 # a new random map path (?random/...) with a seed
2532 # that depends on the exit object 2625 # that depends on the exit object
2533 2626
2534 my $rmp = parse_random_map_params $exit->msg; 2627 my $rmp = parse_random_map_params $exit->msg;
2536 if ($exit->map) { 2629 if ($exit->map) {
2537 $rmp->{region} = $exit->region->name; 2630 $rmp->{region} = $exit->region->name;
2538 $rmp->{origin_map} = $exit->map->path; 2631 $rmp->{origin_map} = $exit->map->path;
2539 $rmp->{origin_x} = $exit->x; 2632 $rmp->{origin_x} = $exit->x;
2540 $rmp->{origin_y} = $exit->y; 2633 $rmp->{origin_y} = $exit->y;
2634
2635 $exit->map->touch;
2541 } 2636 }
2542 2637
2543 $rmp->{random_seed} ||= $exit->random_seed; 2638 $rmp->{random_seed} ||= $exit->random_seed;
2544 2639
2545 my $data = cf::to_json $rmp; 2640 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2546 my $md5 = Digest::MD5::md5_hex $data; 2641 my $md5 = Digest::MD5::md5_hex $data;
2547 my $meta = "$RANDOMDIR/$md5.meta"; 2642 my $meta = "$RANDOMDIR/$md5.meta";
2548 2643
2549 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2644 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2550 aio_write $fh, 0, (length $data), $data, 0; 2645 aio_write $fh, 0, (length $data), $data, 0;
2551 undef $fh; 2646 undef $fh;
2552 aio_rename "$meta~", $meta; 2647 aio_rename "$meta~", $meta;
2553 2648
2649 my $slaying = "?random/$md5";
2650
2651 if ($exit->valid) {
2554 $exit->slaying ("?random/$md5"); 2652 $exit->slaying ("?random/$md5");
2555 $exit->msg (undef); 2653 $exit->msg (undef);
2654 }
2556 } 2655 }
2557} 2656}
2558 2657
2559sub cf::object::player::enter_exit { 2658sub cf::object::player::enter_exit {
2560 my ($self, $exit) = @_; 2659 my ($self, $exit) = @_;
2561 2660
2562 return unless $self->type == cf::PLAYER; 2661 return unless $self->type == cf::PLAYER;
2563 2662
2564 if ($exit->slaying eq "/!") {
2565 #TODO: this should de-fi-ni-te-ly not be a sync-job
2566 # the problem is that $exit might not survive long enough
2567 # so it needs to be done right now, right here
2568 cf::sync_job { prepare_random_map $exit };
2569 }
2570
2571 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2572 my $hp = $exit->stats->hp;
2573 my $sp = $exit->stats->sp;
2574
2575 $self->enter_link; 2663 $self->enter_link;
2576 2664
2577 # if exit is damned, update players death & WoR home-position
2578 $self->contr->savebed ($slaying, $hp, $sp)
2579 if $exit->flag (FLAG_DAMNED);
2580
2581 (async { 2665 (async {
2582 $self->deactivate_recursive; # just to be sure 2666 $Coro::current->{desc} = "enter_exit";
2667
2583 unless (eval { 2668 unless (eval {
2669 $self->deactivate_recursive; # just to be sure
2670
2671 # random map handling
2672 {
2673 my $guard = cf::lock_acquire "exit_prepare:$exit";
2674
2675 prepare_random_map $exit
2676 if $exit->slaying eq "/!";
2677 }
2678
2679 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2680 my $x = $exit->stats->hp;
2681 my $y = $exit->stats->sp;
2682
2584 $self->goto ($slaying, $hp, $sp); 2683 $self->goto ($map, $x, $y);
2585 2684
2685 # if exit is damned, update players death & WoR home-position
2686 $self->contr->savebed ($map, $x, $y)
2687 if $exit->flag (cf::FLAG_DAMNED);
2688
2586 1; 2689 1
2587 }) { 2690 }) {
2588 $self->message ("Something went wrong deep within the crossfire server. " 2691 $self->message ("Something went wrong deep within the crossfire server. "
2589 . "I'll try to bring you back to the map you were before. " 2692 . "I'll try to bring you back to the map you were before. "
2590 . "Please report this to the dungeon master!", 2693 . "Please report this to the dungeon master!",
2591 cf::NDI_UNIQUE | cf::NDI_RED); 2694 cf::NDI_UNIQUE | cf::NDI_RED);
2621the message, with C<log> being the default. If C<$color> is negative, suppress 2724the message, with C<log> being the default. If C<$color> is negative, suppress
2622the message unless the client supports the msg packet. 2725the message unless the client supports the msg packet.
2623 2726
2624=cut 2727=cut
2625 2728
2729# non-persistent channels (usually the info channel)
2626our %CHANNEL = ( 2730our %CHANNEL = (
2627 "c/identify" => { 2731 "c/identify" => {
2628 id => "identify", 2732 id => "infobox",
2629 title => "Identify", 2733 title => "Identify",
2630 reply => undef, 2734 reply => undef,
2631 tooltip => "Items recently identified", 2735 tooltip => "Items recently identified",
2632 }, 2736 },
2633 "c/examine" => { 2737 "c/examine" => {
2634 id => "examine", 2738 id => "infobox",
2635 title => "Examine", 2739 title => "Examine",
2636 reply => undef, 2740 reply => undef,
2637 tooltip => "Signs and other items you examined", 2741 tooltip => "Signs and other items you examined",
2638 }, 2742 },
2743 "c/book" => {
2744 id => "infobox",
2745 title => "Book",
2746 reply => undef,
2747 tooltip => "The contents of a note or book",
2748 },
2749 "c/lookat" => {
2750 id => "infobox",
2751 title => "Look",
2752 reply => undef,
2753 tooltip => "What you saw there",
2754 },
2755 "c/who" => {
2756 id => "infobox",
2757 title => "Players",
2758 reply => undef,
2759 tooltip => "Shows players who are currently online",
2760 },
2761 "c/body" => {
2762 id => "infobox",
2763 title => "Body Parts",
2764 reply => undef,
2765 tooltip => "Shows which body parts you posess and are available",
2766 },
2767 "c/uptime" => {
2768 id => "infobox",
2769 title => "Uptime",
2770 reply => undef,
2771 tooltip => "How long the server has been running since last restart",
2772 },
2773 "c/mapinfo" => {
2774 id => "infobox",
2775 title => "Map Info",
2776 reply => undef,
2777 tooltip => "Information related to the maps",
2778 },
2779 "c/party" => {
2780 id => "party",
2781 title => "Party",
2782 reply => "gsay ",
2783 tooltip => "Messages and chat related to your party",
2784 },
2639); 2785);
2640 2786
2641sub cf::client::send_msg { 2787sub cf::client::send_msg {
2642 my ($self, $channel, $msg, $color, @extra) = @_; 2788 my ($self, $channel, $msg, $color, @extra) = @_;
2643 2789
2644 $msg = $self->pl->expand_cfpod ($msg); 2790 $msg = $self->pl->expand_cfpod ($msg);
2645 2791
2646 $color &= cf::NDI_CLIENT_MASK; # just in case... 2792 $color &= cf::NDI_CLIENT_MASK; # just in case...
2647 2793
2648 # check predefined channels, for the benefit of C 2794 # check predefined channels, for the benefit of C
2649 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2795 if ($CHANNEL{$channel}) {
2796 $channel = $CHANNEL{$channel};
2650 2797
2798 $self->ext_msg (channel_info => $channel)
2799 if $self->can_msg;
2800
2801 $channel = $channel->{id};
2802
2651 if (ref $channel) { 2803 } elsif (ref $channel) {
2652 # send meta info to client, if not yet sent 2804 # send meta info to client, if not yet sent
2653 unless (exists $self->{channel}{$channel->{id}}) { 2805 unless (exists $self->{channel}{$channel->{id}}) {
2654 $self->{channel}{$channel->{id}} = $channel; 2806 $self->{channel}{$channel->{id}} = $channel;
2655 $self->ext_msg (channel_info => $channel) 2807 $self->ext_msg (channel_info => $channel)
2656 if $self->can_msg; 2808 if $self->can_msg;
2664 if ($self->can_msg) { 2816 if ($self->can_msg) {
2665 # default colour, mask it out 2817 # default colour, mask it out
2666 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2818 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2667 if $color & cf::NDI_DEF; 2819 if $color & cf::NDI_DEF;
2668 2820
2669 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2821 my $pkt = "msg "
2822 . $self->{json_coder}->encode (
2670 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2823 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2824 );
2825
2826 # try lzf for large packets
2827 $pkt = "lzf " . Compress::LZF::compress $pkt
2828 if 1024 <= length $pkt and $self->{can_lzf};
2829
2830 # split very large packets
2831 if (8192 < length $pkt and $self->{can_lzf}) {
2832 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2833 $pkt = "frag";
2834 }
2835
2836 $self->send_packet ($pkt);
2671 } else { 2837 } else {
2672 if ($color >= 0) { 2838 if ($color >= 0) {
2673 # replace some tags by gcfclient-compatible ones 2839 # replace some tags by gcfclient-compatible ones
2674 for ($msg) { 2840 for ($msg) {
2675 1 while 2841 1 while
2873=pod 3039=pod
2874 3040
2875The following functions and methods are available within a safe environment: 3041The following functions and methods are available within a safe environment:
2876 3042
2877 cf::object 3043 cf::object
2878 contr pay_amount pay_player map x y force_find force_add 3044 contr pay_amount pay_player map x y force_find force_add destroy
2879 insert remove name archname title slaying race decrease_ob_nr 3045 insert remove name archname title slaying race decrease split
2880 3046
2881 cf::object::player 3047 cf::object::player
2882 player 3048 player
2883 3049
2884 cf::player 3050 cf::player
2889 3055
2890=cut 3056=cut
2891 3057
2892for ( 3058for (
2893 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3059 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2894 insert remove inv name archname title slaying race 3060 insert remove inv nrof name archname title slaying race
2895 decrease_ob_nr)], 3061 decrease split destroy change_exp)],
2896 ["cf::object::player" => qw(player)], 3062 ["cf::object::player" => qw(player)],
2897 ["cf::player" => qw(peaceful)], 3063 ["cf::player" => qw(peaceful)],
2898 ["cf::map" => qw(trigger)], 3064 ["cf::map" => qw(trigger)],
2899) { 3065) {
2900 no strict 'refs'; 3066 no strict 'refs';
3005 { 3171 {
3006 my $faces = $facedata->{faceinfo}; 3172 my $faces = $facedata->{faceinfo};
3007 3173
3008 while (my ($face, $info) = each %$faces) { 3174 while (my ($face, $info) = each %$faces) {
3009 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3175 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3176
3010 cf::face::set_visibility $idx, $info->{visibility}; 3177 cf::face::set_visibility $idx, $info->{visibility};
3011 cf::face::set_magicmap $idx, $info->{magicmap}; 3178 cf::face::set_magicmap $idx, $info->{magicmap};
3012 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3179 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3013 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3180 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3014 3181
3015 cf::cede_to_tick; 3182 cf::cede_to_tick;
3016 } 3183 }
3017 3184
3018 while (my ($face, $info) = each %$faces) { 3185 while (my ($face, $info) = each %$faces) {
3019 next unless $info->{smooth}; 3186 next unless $info->{smooth};
3187
3020 my $idx = cf::face::find $face 3188 my $idx = cf::face::find $face
3021 or next; 3189 or next;
3190
3022 if (my $smooth = cf::face::find $info->{smooth}) { 3191 if (my $smooth = cf::face::find $info->{smooth}) {
3023 cf::face::set_smooth $idx, $smooth; 3192 cf::face::set_smooth $idx, $smooth;
3024 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3193 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3025 } else { 3194 } else {
3026 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3195 warn "smooth face '$info->{smooth}' not found for face '$face'";
3044 { 3213 {
3045 # TODO: for gcfclient pleasure, we should give resources 3214 # TODO: for gcfclient pleasure, we should give resources
3046 # that gcfclient doesn't grok a >10000 face index. 3215 # that gcfclient doesn't grok a >10000 face index.
3047 my $res = $facedata->{resource}; 3216 my $res = $facedata->{resource};
3048 3217
3049 my $soundconf = delete $res->{"res/sound.conf"};
3050
3051 while (my ($name, $info) = each %$res) { 3218 while (my ($name, $info) = each %$res) {
3219 if (defined $info->{type}) {
3052 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3220 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3053 my $data; 3221 my $data;
3054 3222
3055 if ($info->{type} & 1) { 3223 if ($info->{type} & 1) {
3056 # prepend meta info 3224 # prepend meta info
3057 3225
3058 my $meta = $enc->encode ({ 3226 my $meta = $enc->encode ({
3059 name => $name, 3227 name => $name,
3060 %{ $info->{meta} || {} }, 3228 %{ $info->{meta} || {} },
3061 }); 3229 });
3062 3230
3063 $data = pack "(w/a*)*", $meta, $info->{data}; 3231 $data = pack "(w/a*)*", $meta, $info->{data};
3232 } else {
3233 $data = $info->{data};
3234 }
3235
3236 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3237 cf::face::set_type $idx, $info->{type};
3064 } else { 3238 } else {
3065 $data = $info->{data}; 3239 $RESOURCE{$name} = $info;
3066 } 3240 }
3067 3241
3068 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3069 cf::face::set_type $idx, $info->{type};
3070
3071 cf::cede_to_tick; 3242 cf::cede_to_tick;
3072 } 3243 }
3073
3074 if ($soundconf) {
3075 $soundconf = $enc->decode (delete $soundconf->{data});
3076
3077 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3078 my $sound = $soundconf->{compat}[$_]
3079 or next;
3080
3081 my $face = cf::face::find "sound/$sound->[1]";
3082 cf::sound::set $sound->[0] => $face;
3083 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3084 }
3085
3086 while (my ($k, $v) = each %{$soundconf->{event}}) {
3087 my $face = cf::face::find "sound/$v";
3088 cf::sound::set $k => $face;
3089 }
3090 }
3091 } 3244 }
3245
3246 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3092 3247
3093 1 3248 1
3094} 3249}
3250
3251cf::global->attach (on_resource_update => sub {
3252 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3253 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3254
3255 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3256 my $sound = $soundconf->{compat}[$_]
3257 or next;
3258
3259 my $face = cf::face::find "sound/$sound->[1]";
3260 cf::sound::set $sound->[0] => $face;
3261 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3262 }
3263
3264 while (my ($k, $v) = each %{$soundconf->{event}}) {
3265 my $face = cf::face::find "sound/$v";
3266 cf::sound::set $k => $face;
3267 }
3268 }
3269});
3095 3270
3096register_exticmd fx_want => sub { 3271register_exticmd fx_want => sub {
3097 my ($ns, $want) = @_; 3272 my ($ns, $want) = @_;
3098 3273
3099 while (my ($k, $v) = each %$want) { 3274 while (my ($k, $v) = each %$want) {
3100 $ns->fx_want ($k, $v); 3275 $ns->fx_want ($k, $v);
3101 } 3276 }
3102}; 3277};
3278
3279sub load_resource_file($) {
3280 my $guard = lock_acquire "load_resource_file";
3281
3282 my $status = load_resource_file_ $_[0];
3283 get_slot 0.1, 100;
3284 cf::arch::commit_load;
3285
3286 $status
3287}
3103 3288
3104sub reload_regions { 3289sub reload_regions {
3105 # HACK to clear player env face cache, we need some signal framework 3290 # HACK to clear player env face cache, we need some signal framework
3106 # for this (global event?) 3291 # for this (global event?)
3107 %ext::player_env::MUSIC_FACE_CACHE = (); 3292 %ext::player_env::MUSIC_FACE_CACHE = ();
3121} 3306}
3122 3307
3123sub reload_archetypes { 3308sub reload_archetypes {
3124 load_resource_file "$DATADIR/archetypes" 3309 load_resource_file "$DATADIR/archetypes"
3125 or die "unable to load archetypes\n"; 3310 or die "unable to load archetypes\n";
3126 #d# NEED to laod twice to resolve forward references
3127 # this really needs to be done in an extra post-pass
3128 # (which needs to be synchronous, so solve it differently)
3129 load_resource_file "$DATADIR/archetypes"
3130 or die "unable to load archetypes\n";
3131} 3311}
3132 3312
3133sub reload_treasures { 3313sub reload_treasures {
3134 load_resource_file "$DATADIR/treasures" 3314 load_resource_file "$DATADIR/treasures"
3135 or die "unable to load treasurelists\n"; 3315 or die "unable to load treasurelists\n";
3136} 3316}
3137 3317
3138sub reload_resources { 3318sub reload_resources {
3139 warn "reloading resource files...\n"; 3319 warn "reloading resource files...\n";
3140 3320
3321 reload_facedata;
3322 reload_archetypes;
3141 reload_regions; 3323 reload_regions;
3142 reload_facedata;
3143 #reload_archetypes;#d#
3144 reload_archetypes;
3145 reload_treasures; 3324 reload_treasures;
3146 3325
3147 warn "finished reloading resource files\n"; 3326 warn "finished reloading resource files\n";
3148} 3327}
3149 3328
3150sub init { 3329sub init {
3330 my $guard = freeze_mainloop;
3331
3332 evthread_start IO::AIO::poll_fileno;
3333
3151 reload_resources; 3334 reload_resources;
3152} 3335}
3153 3336
3154sub reload_config { 3337sub reload_config {
3155 open my $fh, "<:utf8", "$CONFDIR/config" 3338 open my $fh, "<:utf8", "$CONFDIR/config"
3156 or return; 3339 or return;
3157 3340
3158 local $/; 3341 local $/;
3159 *CFG = YAML::Syck::Load <$fh>; 3342 *CFG = YAML::Load <$fh>;
3160 3343
3161 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3344 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3162 3345
3163 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3346 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3164 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3347 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3175sub main { 3358sub main {
3176 # we must not ever block the main coroutine 3359 # we must not ever block the main coroutine
3177 local $Coro::idle = sub { 3360 local $Coro::idle = sub {
3178 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3361 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3179 (async { 3362 (async {
3180 Event::one_event; 3363 $Coro::current->{desc} = "IDLE BUG HANDLER";
3364 EV::loop EV::LOOP_ONESHOT;
3181 })->prio (Coro::PRIO_MAX); 3365 })->prio (Coro::PRIO_MAX);
3182 }; 3366 };
3183 3367
3368 {
3369 my $guard = freeze_mainloop;
3184 reload_config; 3370 reload_config;
3185 db_init; 3371 db_init;
3186 load_extensions; 3372 load_extensions;
3187 3373
3188 $TICK_WATCHER->start; 3374 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3375 }
3376
3189 Event::loop; 3377 EV::loop;
3190} 3378}
3191 3379
3192############################################################################# 3380#############################################################################
3193# initialisation and cleanup 3381# initialisation and cleanup
3194 3382
3195# install some emergency cleanup handlers 3383# install some emergency cleanup handlers
3196BEGIN { 3384BEGIN {
3385 our %SIGWATCHER = ();
3197 for my $signal (qw(INT HUP TERM)) { 3386 for my $signal (qw(INT HUP TERM)) {
3198 Event->signal ( 3387 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3199 reentrant => 0,
3200 data => WF_AUTOCANCEL,
3201 signal => $signal,
3202 prio => 0,
3203 cb => sub {
3204 cf::cleanup "SIG$signal"; 3388 cf::cleanup "SIG$signal";
3205 },
3206 ); 3389 };
3207 } 3390 }
3208} 3391}
3209 3392
3210sub write_runtime { 3393sub write_runtime_sync {
3211 my $runtime = "$LOCALDIR/runtime"; 3394 my $runtime = "$LOCALDIR/runtime";
3212 3395
3213 # first touch the runtime file to show we are still running: 3396 # first touch the runtime file to show we are still running:
3214 # the fsync below can take a very very long time. 3397 # the fsync below can take a very very long time.
3215 3398
3241 and return; 3424 and return;
3242 3425
3243 warn "runtime file written.\n"; 3426 warn "runtime file written.\n";
3244 3427
3245 1 3428 1
3429}
3430
3431our $uuid_lock;
3432our $uuid_skip;
3433
3434sub write_uuid_sync($) {
3435 $uuid_skip ||= $_[0];
3436
3437 return if $uuid_lock;
3438 local $uuid_lock = 1;
3439
3440 my $uuid = "$LOCALDIR/uuid";
3441
3442 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3443 or return;
3444
3445 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3446 $uuid_skip = 0;
3447
3448 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3449 and return;
3450
3451 # always fsync - this file is important
3452 aio_fsync $fh
3453 and return;
3454
3455 close $fh
3456 or return;
3457
3458 aio_rename "$uuid~", $uuid
3459 and return;
3460
3461 warn "uuid file written ($value).\n";
3462
3463 1
3464
3465}
3466
3467sub write_uuid($$) {
3468 my ($skip, $sync) = @_;
3469
3470 $sync ? write_uuid_sync $skip
3471 : async { write_uuid_sync $skip };
3246} 3472}
3247 3473
3248sub emergency_save() { 3474sub emergency_save() {
3249 my $freeze_guard = cf::freeze_mainloop; 3475 my $freeze_guard = cf::freeze_mainloop;
3250 3476
3256 # and maps saved/destroyed asynchronously. 3482 # and maps saved/destroyed asynchronously.
3257 warn "begin emergency player save\n"; 3483 warn "begin emergency player save\n";
3258 for my $login (keys %cf::PLAYER) { 3484 for my $login (keys %cf::PLAYER) {
3259 my $pl = $cf::PLAYER{$login} or next; 3485 my $pl = $cf::PLAYER{$login} or next;
3260 $pl->valid or next; 3486 $pl->valid or next;
3487 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3261 $pl->save; 3488 $pl->save;
3262 } 3489 }
3263 warn "end emergency player save\n"; 3490 warn "end emergency player save\n";
3264 3491
3265 warn "begin emergency map save\n"; 3492 warn "begin emergency map save\n";
3271 warn "end emergency map save\n"; 3498 warn "end emergency map save\n";
3272 3499
3273 warn "begin emergency database checkpoint\n"; 3500 warn "begin emergency database checkpoint\n";
3274 BDB::db_env_txn_checkpoint $DB_ENV; 3501 BDB::db_env_txn_checkpoint $DB_ENV;
3275 warn "end emergency database checkpoint\n"; 3502 warn "end emergency database checkpoint\n";
3503
3504 warn "begin write uuid\n";
3505 write_uuid_sync 1;
3506 warn "end write uuid\n";
3276 }; 3507 };
3277 3508
3278 warn "leave emergency perl save\n"; 3509 warn "leave emergency perl save\n";
3279} 3510}
3280 3511
3282 my ($make_core) = @_; 3513 my ($make_core) = @_;
3283 3514
3284 warn Carp::longmess "post_cleanup backtrace" 3515 warn Carp::longmess "post_cleanup backtrace"
3285 if $make_core; 3516 if $make_core;
3286} 3517}
3518
3519# a safer delete_package, copied from Symbol
3520sub clear_package($) {
3521 my $pkg = shift;
3522
3523 # expand to full symbol table name if needed
3524 unless ($pkg =~ /^main::.*::$/) {
3525 $pkg = "main$pkg" if $pkg =~ /^::/;
3526 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3527 $pkg .= '::' unless $pkg =~ /::$/;
3528 }
3529
3530 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3531 my $stem_symtab = *{$stem}{HASH};
3532
3533 defined $stem_symtab and exists $stem_symtab->{$leaf}
3534 or return;
3535
3536 # clear all symbols
3537 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3538 for my $name (keys %$leaf_symtab) {
3539 _gv_clear *{"$pkg$name"};
3540# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3541 }
3542 warn "cleared package #$pkg\n";#d#
3543}
3544
3545our $RELOAD; # how many times to reload
3287 3546
3288sub do_reload_perl() { 3547sub do_reload_perl() {
3289 # can/must only be called in main 3548 # can/must only be called in main
3290 if ($Coro::current != $Coro::main) { 3549 if ($Coro::current != $Coro::main) {
3291 warn "can only reload from main coroutine"; 3550 warn "can only reload from main coroutine";
3292 return; 3551 return;
3293 } 3552 }
3294 3553
3554 return if $RELOAD++;
3555
3556 while ($RELOAD) {
3295 warn "reloading..."; 3557 warn "reloading...";
3296 3558
3297 warn "entering sync_job"; 3559 warn "entering sync_job";
3298 3560
3299 cf::sync_job { 3561 cf::sync_job {
3300 cf::write_runtime; # external watchdog should not bark 3562 cf::write_runtime_sync; # external watchdog should not bark
3301 cf::emergency_save; 3563 cf::emergency_save;
3302 cf::write_runtime; # external watchdog should not bark 3564 cf::write_runtime_sync; # external watchdog should not bark
3303 3565
3304 warn "syncing database to disk"; 3566 warn "syncing database to disk";
3305 BDB::db_env_txn_checkpoint $DB_ENV; 3567 BDB::db_env_txn_checkpoint $DB_ENV;
3306 3568
3307 # if anything goes wrong in here, we should simply crash as we already saved 3569 # if anything goes wrong in here, we should simply crash as we already saved
3308 3570
3309 warn "cancelling all WF_AUTOCANCEL watchers";
3310 for (Event::all_watchers) {
3311 $_->cancel if $_->data & WF_AUTOCANCEL;
3312 }
3313
3314 warn "flushing outstanding aio requests"; 3571 warn "flushing outstanding aio requests";
3315 for (;;) {
3316 BDB::flush;
3317 IO::AIO::flush;
3318 Coro::cede;
3319 last unless IO::AIO::nreqs || BDB::nreqs; 3572 while (IO::AIO::nreqs || BDB::nreqs) {
3320 warn "iterate..."; 3573 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3321 }
3322
3323 ++$RELOAD;
3324
3325 warn "cancelling all extension coros";
3326 $_->cancel for values %EXT_CORO;
3327 %EXT_CORO = ();
3328
3329 warn "removing commands";
3330 %COMMAND = ();
3331
3332 warn "removing ext/exti commands";
3333 %EXTCMD = ();
3334 %EXTICMD = ();
3335
3336 warn "unloading/nuking all extensions";
3337 for my $pkg (@EXTS) {
3338 warn "... unloading $pkg";
3339
3340 if (my $cb = $pkg->can ("unload")) {
3341 eval {
3342 $cb->($pkg);
3343 1
3344 } or warn "$pkg unloaded, but with errors: $@";
3345 } 3574 }
3346 3575
3347 warn "... nuking $pkg"; 3576 warn "cancelling all extension coros";
3348 Symbol::delete_package $pkg; 3577 $_->cancel for values %EXT_CORO;
3349 } 3578 %EXT_CORO = ();
3350 3579
3351 warn "unloading all perl modules loaded from $LIBDIR"; 3580 warn "removing commands";
3352 while (my ($k, $v) = each %INC) { 3581 %COMMAND = ();
3353 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3354 3582
3583 warn "removing ext/exti commands";
3584 %EXTCMD = ();
3585 %EXTICMD = ();
3586
3587 warn "unloading/nuking all extensions";
3588 for my $pkg (@EXTS) {
3355 warn "... unloading $k"; 3589 warn "... unloading $pkg";
3356 delete $INC{$k};
3357 3590
3358 $k =~ s/\.pm$//;
3359 $k =~ s/\//::/g;
3360
3361 if (my $cb = $k->can ("unload_module")) { 3591 if (my $cb = $pkg->can ("unload")) {
3592 eval {
3362 $cb->(); 3593 $cb->($pkg);
3594 1
3595 } or warn "$pkg unloaded, but with errors: $@";
3596 }
3597
3598 warn "... clearing $pkg";
3599 clear_package $pkg;
3363 } 3600 }
3364 3601
3365 Symbol::delete_package $k; 3602 warn "unloading all perl modules loaded from $LIBDIR";
3603 while (my ($k, $v) = each %INC) {
3604 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3605
3606 warn "... unloading $k";
3607 delete $INC{$k};
3608
3609 $k =~ s/\.pm$//;
3610 $k =~ s/\//::/g;
3611
3612 if (my $cb = $k->can ("unload_module")) {
3613 $cb->();
3614 }
3615
3616 clear_package $k;
3366 } 3617 }
3367 3618
3368 warn "getting rid of safe::, as good as possible"; 3619 warn "getting rid of safe::, as good as possible";
3369 Symbol::delete_package "safe::$_" 3620 clear_package "safe::$_"
3370 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3621 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3371 3622
3372 warn "unloading cf.pm \"a bit\""; 3623 warn "unloading cf.pm \"a bit\"";
3373 delete $INC{"cf.pm"}; 3624 delete $INC{"cf.pm"};
3374 delete $INC{"cf/pod.pm"}; 3625 delete $INC{"cf/pod.pm"};
3375 3626
3376 # don't, removes xs symbols, too, 3627 # don't, removes xs symbols, too,
3377 # and global variables created in xs 3628 # and global variables created in xs
3378 #Symbol::delete_package __PACKAGE__; 3629 #clear_package __PACKAGE__;
3379 3630
3380 warn "unload completed, starting to reload now"; 3631 warn "unload completed, starting to reload now";
3381 3632
3382 warn "reloading cf.pm"; 3633 warn "reloading cf.pm";
3383 require cf; 3634 require cf;
3384 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3635 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3385 3636
3386 warn "loading config and database again"; 3637 warn "loading config and database again";
3387 cf::reload_config; 3638 cf::reload_config;
3388 3639
3389 warn "loading extensions"; 3640 warn "loading extensions";
3390 cf::load_extensions; 3641 cf::load_extensions;
3391 3642
3392 warn "reattaching attachments to objects/players"; 3643 warn "reattaching attachments to objects/players";
3393 _global_reattach; # objects, sockets 3644 _global_reattach; # objects, sockets
3394 warn "reattaching attachments to maps"; 3645 warn "reattaching attachments to maps";
3395 reattach $_ for values %MAP; 3646 reattach $_ for values %MAP;
3396 warn "reattaching attachments to players"; 3647 warn "reattaching attachments to players";
3397 reattach $_ for values %PLAYER; 3648 reattach $_ for values %PLAYER;
3398 3649
3399 warn "leaving sync_job"; 3650 warn "leaving sync_job";
3400 3651
3401 1 3652 1
3402 } or do { 3653 } or do {
3403 warn $@; 3654 warn $@;
3404 warn "error while reloading, exiting."; 3655 cf::cleanup "error while reloading, exiting.";
3405 exit 1;
3406 }; 3656 };
3407 3657
3408 warn "reloaded"; 3658 warn "reloaded";
3659 --$RELOAD;
3660 }
3409}; 3661};
3410 3662
3411our $RELOAD_WATCHER; # used only during reload 3663our $RELOAD_WATCHER; # used only during reload
3412 3664
3413sub reload_perl() { 3665sub reload_perl() {
3414 # doing reload synchronously and two reloads happen back-to-back, 3666 # doing reload synchronously and two reloads happen back-to-back,
3415 # coro crashes during coro_state_free->destroy here. 3667 # coro crashes during coro_state_free->destroy here.
3416 3668
3417 $RELOAD_WATCHER ||= Event->timer ( 3669 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3418 reentrant => 0,
3419 after => 0,
3420 data => WF_AUTOCANCEL,
3421 cb => sub {
3422 do_reload_perl; 3670 do_reload_perl;
3423 undef $RELOAD_WATCHER; 3671 undef $RELOAD_WATCHER;
3424 },
3425 ); 3672 };
3426} 3673}
3427 3674
3428register_command "reload" => sub { 3675register_command "reload" => sub {
3429 my ($who, $arg) = @_; 3676 my ($who, $arg) = @_;
3430 3677
3431 if ($who->flag (FLAG_WIZ)) { 3678 if ($who->flag (FLAG_WIZ)) {
3432 $who->message ("reloading server."); 3679 $who->message ("reloading server.");
3680 async {
3681 $Coro::current->{desc} = "perl_reload";
3433 async { reload_perl }; 3682 reload_perl;
3683 };
3434 } 3684 }
3435}; 3685};
3436 3686
3437unshift @INC, $LIBDIR; 3687unshift @INC, $LIBDIR;
3438 3688
3440 3690
3441our @WAIT_FOR_TICK; 3691our @WAIT_FOR_TICK;
3442our @WAIT_FOR_TICK_BEGIN; 3692our @WAIT_FOR_TICK_BEGIN;
3443 3693
3444sub wait_for_tick { 3694sub wait_for_tick {
3445 return unless $TICK_WATCHER->is_active;
3446 return if $Coro::current == $Coro::main; 3695 return if tick_inhibit || $Coro::current == $Coro::main;
3447 3696
3448 my $signal = new Coro::Signal; 3697 my $signal = new Coro::Signal;
3449 push @WAIT_FOR_TICK, $signal; 3698 push @WAIT_FOR_TICK, $signal;
3450 $signal->wait; 3699 $signal->wait;
3451} 3700}
3452 3701
3453sub wait_for_tick_begin { 3702sub wait_for_tick_begin {
3454 return unless $TICK_WATCHER->is_active;
3455 return if $Coro::current == $Coro::main; 3703 return if tick_inhibit || $Coro::current == $Coro::main;
3456 3704
3457 my $signal = new Coro::Signal; 3705 my $signal = new Coro::Signal;
3458 push @WAIT_FOR_TICK_BEGIN, $signal; 3706 push @WAIT_FOR_TICK_BEGIN, $signal;
3459 $signal->wait; 3707 $signal->wait;
3460} 3708}
3461 3709
3462$TICK_WATCHER = Event->timer ( 3710sub tick {
3463 reentrant => 0,
3464 parked => 1,
3465 prio => 0,
3466 at => $NEXT_TICK || $TICK,
3467 data => WF_AUTOCANCEL,
3468 cb => sub {
3469 if ($Coro::current != $Coro::main) { 3711 if ($Coro::current != $Coro::main) {
3470 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3712 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3471 unless ++$bug_warning > 10; 3713 unless ++$bug_warning > 10;
3472 return; 3714 return;
3473 } 3715 }
3474 3716
3475 $NOW = $tick_start = Event::time;
3476
3477 cf::server_tick; # one server iteration 3717 cf::server_tick; # one server iteration
3478 3718
3479 $RUNTIME += $TICK;
3480 $NEXT_TICK += $TICK;
3481
3482 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3719 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3483 $NEXT_RUNTIME_WRITE = $NOW + 10; 3720 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3484 Coro::async_pool { 3721 Coro::async_pool {
3722 $Coro::current->{desc} = "runtime saver";
3485 write_runtime 3723 write_runtime_sync
3486 or warn "ERROR: unable to write runtime file: $!"; 3724 or warn "ERROR: unable to write runtime file: $!";
3487 };
3488 } 3725 };
3726 }
3489 3727
3490 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3728 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3491 $sig->send; 3729 $sig->send;
3492 } 3730 }
3493 while (my $sig = shift @WAIT_FOR_TICK) { 3731 while (my $sig = shift @WAIT_FOR_TICK) {
3494 $sig->send; 3732 $sig->send;
3495 } 3733 }
3496 3734
3497 $NOW = Event::time; 3735 $LOAD = ($NOW - $TICK_START) / $TICK;
3498
3499 # if we are delayed by four ticks or more, skip them all
3500 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3501
3502 $TICK_WATCHER->at ($NEXT_TICK);
3503 $TICK_WATCHER->start;
3504
3505 $LOAD = ($NOW - $tick_start) / $TICK;
3506 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3736 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3507 3737
3508 _post_tick; 3738 if (0) {
3739 if ($NEXT_TICK) {
3740 my $jitter = $TICK_START - $NEXT_TICK;
3741 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3742 warn "jitter $JITTER\n";#d#
3743 }
3509 }, 3744 }
3510); 3745}
3511 3746
3512{ 3747{
3748 # configure BDB
3749
3513 BDB::min_parallel 8; 3750 BDB::min_parallel 8;
3514 BDB::max_poll_time $TICK * 0.1; 3751 BDB::max_poll_reqs $TICK * 0.1;
3515 $BDB_POLL_WATCHER = Event->io ( 3752 $AnyEvent::BDB::WATCHER->priority (1);
3516 reentrant => 0,
3517 fd => BDB::poll_fileno,
3518 poll => 'r',
3519 prio => 0,
3520 data => WF_AUTOCANCEL,
3521 cb => \&BDB::poll_cb,
3522 );
3523
3524 BDB::set_sync_prepare {
3525 my $status;
3526 my $current = $Coro::current;
3527 (
3528 sub {
3529 $status = $!;
3530 $current->ready; undef $current;
3531 },
3532 sub {
3533 Coro::schedule while defined $current;
3534 $! = $status;
3535 },
3536 )
3537 };
3538 3753
3539 unless ($DB_ENV) { 3754 unless ($DB_ENV) {
3540 $DB_ENV = BDB::db_env_create; 3755 $DB_ENV = BDB::db_env_create;
3541 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3756 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3542 | BDB::LOG_AUTOREMOVE, 1); 3757 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3758 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3543 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3759 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3544 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3760 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3545 3761
3546 cf::sync_job { 3762 cf::sync_job {
3547 eval { 3763 eval {
3557 3773
3558 cf::cleanup "db_env_open(db): $@" if $@; 3774 cf::cleanup "db_env_open(db): $@" if $@;
3559 }; 3775 };
3560 } 3776 }
3561 3777
3562 $BDB_DEADLOCK_WATCHER = Event->timer ( 3778 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3563 after => 3,
3564 interval => 1,
3565 hard => 1,
3566 prio => 0,
3567 data => WF_AUTOCANCEL,
3568 cb => sub {
3569 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3779 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3570 },
3571 ); 3780 };
3572 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3781 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3573 after => 11,
3574 interval => 60,
3575 hard => 1,
3576 prio => 0,
3577 data => WF_AUTOCANCEL,
3578 cb => sub {
3579 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3782 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3580 },
3581 ); 3783 };
3582 $BDB_TRICKLE_WATCHER = Event->timer ( 3784 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3583 after => 5,
3584 interval => 10,
3585 hard => 1,
3586 prio => 0,
3587 data => WF_AUTOCANCEL,
3588 cb => sub {
3589 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3785 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3590 },
3591 ); 3786 };
3592} 3787}
3593 3788
3594{ 3789{
3790 # configure IO::AIO
3791
3595 IO::AIO::min_parallel 8; 3792 IO::AIO::min_parallel 8;
3596
3597 undef $Coro::AIO::WATCHER;
3598 IO::AIO::max_poll_time $TICK * 0.1; 3793 IO::AIO::max_poll_time $TICK * 0.1;
3599 $AIO_POLL_WATCHER = Event->io ( 3794 undef $AnyEvent::AIO::WATCHER;
3600 reentrant => 0,
3601 data => WF_AUTOCANCEL,
3602 fd => IO::AIO::poll_fileno,
3603 poll => 'r',
3604 prio => 6,
3605 cb => \&IO::AIO::poll_cb,
3606 );
3607} 3795}
3608 3796
3609my $_log_backtrace; 3797my $_log_backtrace;
3610 3798
3611sub _log_backtrace { 3799sub _log_backtrace {
3615 3803
3616 # limit the # of concurrent backtraces 3804 # limit the # of concurrent backtraces
3617 if ($_log_backtrace < 2) { 3805 if ($_log_backtrace < 2) {
3618 ++$_log_backtrace; 3806 ++$_log_backtrace;
3619 async { 3807 async {
3808 $Coro::current->{desc} = "abt $msg";
3809
3620 my @bt = fork_call { 3810 my @bt = fork_call {
3621 @addr = map { sprintf "%x", $_ } @addr; 3811 @addr = map { sprintf "%x", $_ } @addr;
3622 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3812 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3623 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3813 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3624 or die "addr2line: $!"; 3814 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines