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.183 by root, Fri Jan 19 19:42:37 2007 UTC vs.
Revision 1.276 by root, Sun Jun 10 04:05:47 2007 UTC

3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket;
8use Storable; 9use Storable;
10use Event;
9use Opcode; 11use Opcode;
10use Safe; 12use Safe;
11use Safe::Hole; 13use Safe::Hole;
12 14
13use Coro 3.4 (); 15use Coro 3.61 ();
16use Coro::State;
17use Coro::Handle;
14use Coro::Event; 18use Coro::Event;
15use Coro::Timer; 19use Coro::Timer;
16use Coro::Signal; 20use Coro::Signal;
17use Coro::Semaphore; 21use Coro::Semaphore;
18use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable;
19 24
25use BDB ();
20use Data::Dumper; 26use Data::Dumper;
21use Digest::MD5; 27use Digest::MD5;
22use Fcntl; 28use Fcntl;
29use YAML::Syck ();
23use IO::AIO 2.32 (); 30use IO::AIO 2.32 ();
24use YAML::Syck ();
25use Time::HiRes; 31use Time::HiRes;
32use Compress::LZF;
26 33
34# configure various modules to our taste
35#
36$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 40$Event::Eval = 1; # no idea why this is required, but it is
28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 41
31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
32$YAML::Syck::ImplicitUnicode = 1; 43$YAML::Syck::ImplicitUnicode = 1;
33 44
34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
35 48
36our %COMMAND = (); 49our %COMMAND = ();
37our %COMMAND_TIME = (); 50our %COMMAND_TIME = ();
38 51
39our @EXTS = (); # list of extension package names 52our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 53our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 54our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps 55our %EXT_MAP = (); # pluggable maps
43 56
57our $RELOAD; # number of reloads so far
44our @EVENT; 58our @EVENT;
45our $LIBDIR = datadir . "/ext";
46 59
47our $TICK = MAX_TIME * 1e-6; 60our $CONFDIR = confdir;
61our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db";
71
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
48our $TICK_WATCHER; 73our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 74our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
51our $NEXT_TICK; 76our $NEXT_TICK;
52our $NOW; 77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off
79
80our $BDB_POLL_WATCHER;
81our $DB_ENV;
53 82
54our %CFG; 83our %CFG;
55 84
56our $UPTIME; $UPTIME ||= time; 85our $UPTIME; $UPTIME ||= time;
57our $RUNTIME; 86our $RUNTIME;
58 87
59our %PLAYER; # all users 88our %PLAYER; # all users
60our %MAP; # all maps 89our %MAP; # all maps
61our $LINK_MAP; # the special {link} map, which is always available 90our $LINK_MAP; # the special {link} map, which is always available
62our $RANDOM_MAPS = cf::localdir . "/random";
63
64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66 91
67# used to convert map paths into valid unix filenames by replacing / by ∕ 92# used to convert map paths into valid unix filenames by replacing / by ∕
68our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
69 94
95our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing
97our $tick_start; # for load detecting purposes
98
70binmode STDOUT; 99binmode STDOUT;
71binmode STDERR; 100binmode STDERR;
72 101
73# read virtual server time, if available 102# read virtual server time, if available
74unless ($RUNTIME || !-e cf::localdir . "/runtime") { 103unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
75 open my $fh, "<", cf::localdir . "/runtime" 104 open my $fh, "<", "$LOCALDIR/runtime"
76 or die "unable to read runtime file: $!"; 105 or die "unable to read runtime file: $!";
77 $RUNTIME = <$fh> + 0.; 106 $RUNTIME = <$fh> + 0.;
78} 107}
79 108
80mkdir cf::localdir; 109mkdir $_
81mkdir cf::localdir . "/" . cf::playerdir; 110 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
82mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS;
85 111
86our $EMERGENCY_POSITION; 112our $EMERGENCY_POSITION;
113
114sub cf::map::normalise;
87 115
88############################################################################# 116#############################################################################
89 117
90=head2 GLOBAL VARIABLES 118=head2 GLOBAL VARIABLES
91 119
98=item $cf::RUNTIME 126=item $cf::RUNTIME
99 127
100The time this server has run, starts at 0 and is increased by $cf::TICK on 128The time this server has run, starts at 0 and is increased by $cf::TICK on
101every server tick. 129every server tick.
102 130
103=item $cf::LIBDIR 131=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
132$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
133$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
104 134
105The perl library directory, where extensions and cf-specific modules can 135Various directories - "/etc", read-only install directory, perl-library
106be found. It will be added to C<@INC> automatically. 136directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
137unique-items directory, player file directory, random maps directory and
138database environment.
107 139
108=item $cf::NOW 140=item $cf::NOW
109 141
110The time of the last (current) server tick. 142The time of the last (current) server tick.
111 143
112=item $cf::TICK 144=item $cf::TICK
113 145
114The interval between server ticks, in seconds. 146The interval between server ticks, in seconds.
147
148=item $cf::LOADAVG
149
150The current CPU load on the server (alpha-smoothed), as a value between 0
151(none) and 1 (overloaded), indicating how much time is spent on processing
152objects per tick. Healthy values are < 0.5.
153
154=item $cf::LOAD
155
156The raw value load value from the last tick.
115 157
116=item %cf::CFG 158=item %cf::CFG
117 159
118Configuration for the server, loaded from C</etc/crossfire/config>, or 160Configuration for the server, loaded from C</etc/crossfire/config>, or
119from wherever your confdir points to. 161from wherever your confdir points to.
120 162
121=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 163=item cf::wait_for_tick, cf::wait_for_tick_begin
122 164
123These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
124or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 166returns directly I<after> the tick processing (and consequently, can only wake one process
125processing has been done. Call C<< ->wait >> on them to maximise the 167per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
126window of cpu time available, or simply to synchronise to the server tick.
127 168
128=back 169=back
129 170
130=cut 171=cut
131 172
132BEGIN { 173BEGIN {
133 *CORE::GLOBAL::warn = sub { 174 *CORE::GLOBAL::warn = sub {
134 my $msg = join "", @_; 175 my $msg = join "", @_;
135 utf8::encode $msg;
136 176
137 $msg .= "\n" 177 $msg .= "\n"
138 unless $msg =~ /\n$/; 178 unless $msg =~ /\n$/;
139 179
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181
182 utf8::encode $msg;
140 LOG llevError, $msg; 183 LOG llevError, $msg;
141 }; 184 };
142} 185}
143 186
144@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
145@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
146@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
147@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
148@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 191@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
192@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
149@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 193@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
150 194
151# we bless all objects into (empty) derived classes to force a method lookup 195# we bless all objects into (empty) derived classes to force a method lookup
152# within the Safe compartment. 196# within the Safe compartment.
153for my $pkg (qw( 197for my $pkg (qw(
154 cf::global cf::attachable 198 cf::global cf::attachable
190 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 234 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
191 $d 235 $d
192 } || "[unable to dump $_[0]: '$@']"; 236 } || "[unable to dump $_[0]: '$@']";
193} 237}
194 238
195use JSON::Syck (); # TODO# replace by JSON::PC once working 239use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
196 240
197=item $ref = cf::from_json $json 241=item $ref = cf::from_json $json
198 242
199Converts a JSON string into the corresponding perl data structure. 243Converts a JSON string into the corresponding perl data structure.
200 244
201=cut
202
203sub from_json($) {
204 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
205 JSON::Syck::Load $_[0]
206}
207
208=item $json = cf::to_json $ref 245=item $json = cf::to_json $ref
209 246
210Converts a perl data structure into its JSON representation. 247Converts a perl data structure into its JSON representation.
211
212=cut
213
214sub to_json($) {
215 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
216 JSON::Syck::Dump $_[0]
217}
218 248
219=item cf::lock_wait $string 249=item cf::lock_wait $string
220 250
221Wait until the given lock is available. See cf::lock_acquire. 251Wait until the given lock is available. See cf::lock_acquire.
222 252
228returned. 258returned.
229 259
230Lock names should begin with a unique identifier (for example, cf::map::find 260Lock names should begin with a unique identifier (for example, cf::map::find
231uses map_find and cf::map::load uses map_load). 261uses map_find and cf::map::load uses map_load).
232 262
263=item $locked = cf::lock_active $string
264
265Return true if the lock is currently active, i.e. somebody has locked it.
266
233=cut 267=cut
234 268
235our %LOCK; 269our %LOCK;
236 270
237sub lock_wait($) { 271sub lock_wait($) {
256 # wake up all waiters, to be on the safe side 290 # wake up all waiters, to be on the safe side
257 $_->ready for @{ delete $LOCK{$key} }; 291 $_->ready for @{ delete $LOCK{$key} };
258 } 292 }
259} 293}
260 294
295sub lock_active($) {
296 my ($key) = @_;
297
298 ! ! $LOCK{$key}
299}
300
261sub freeze_mainloop { 301sub freeze_mainloop {
262 return unless $TICK_WATCHER->is_active; 302 return unless $TICK_WATCHER->is_active;
263 303
264 my $guard = Coro::guard { 304 my $guard = Coro::guard {
265 $TICK_WATCHER->start; 305 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 }; 306 };
268 $WRITE_RUNTIME_WATCHER->stop;
269 $TICK_WATCHER->stop; 307 $TICK_WATCHER->stop;
270 $guard 308 $guard
271} 309}
272 310
273=item cf::async { BLOCK } 311=item cf::async { BLOCK }
295 333
296sub sync_job(&) { 334sub sync_job(&) {
297 my ($job) = @_; 335 my ($job) = @_;
298 336
299 if ($Coro::current == $Coro::main) { 337 if ($Coro::current == $Coro::main) {
338 my $time = Event::time;
339
300 # this is the main coro, too bad, we have to block 340 # this is the main coro, too bad, we have to block
301 # till the operation succeeds, freezing the server :/ 341 # till the operation succeeds, freezing the server :/
302 342
303 # TODO: use suspend/resume instead 343 # TODO: use suspend/resume instead
304 # (but this is cancel-safe) 344 # (but this is cancel-safe)
315 355
316 while ($busy) { 356 while ($busy) {
317 Coro::cede or Event::one_event; 357 Coro::cede or Event::one_event;
318 } 358 }
319 359
360 $time = Event::time - $time;
361
362 LOG llevError | logBacktrace, Carp::longmess "long sync job"
363 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
364
365 $tick_start += $time; # do not account sync jobs to server load
366
320 wantarray ? @res : $res[0] 367 wantarray ? @res : $res[0]
321 } else { 368 } else {
322 # we are in another coroutine, how wonderful, everything just works 369 # we are in another coroutine, how wonderful, everything just works
323 370
324 $job->() 371 $job->()
344 391
345 $coro 392 $coro
346} 393}
347 394
348sub write_runtime { 395sub write_runtime {
349 my $runtime = cf::localdir . "/runtime"; 396 my $runtime = "$LOCALDIR/runtime";
397
398 # first touch the runtime file to show we are still running:
399 # the fsync below can take a very very long time.
400
401 IO::AIO::aio_utime $runtime, undef, undef;
402
403 my $guard = cf::lock_acquire "write_runtime";
350 404
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
352 or return; 406 or return;
353 407
408 my $value = $cf::RUNTIME + 90 + 10;
354 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 409 # 10 is the runtime save interval, for a monotonic clock
410 # 60 allows for the watchdog to kill the server.
411
355 (aio_write $fh, 0, (length $value), $value, 0) <= 0 412 (aio_write $fh, 0, (length $value), $value, 0) <= 0
356 and return; 413 and return;
357 414
415 # always fsync - this file is important
358 aio_fsync $fh 416 aio_fsync $fh
359 and return; 417 and return;
360 418
419 # touch it again to show we are up-to-date
420 aio_utime $fh, undef, undef;
421
361 close $fh 422 close $fh
362 or return; 423 or return;
363 424
364 aio_rename "$runtime~", $runtime 425 aio_rename "$runtime~", $runtime
365 and return; 426 and return;
366 427
428 warn "runtime file written.\n";
429
367 1 430 1
431}
432
433=item cf::datalog type => key => value, ...
434
435Log a datalog packet of the given type with the given key-value pairs.
436
437=cut
438
439sub datalog($@) {
440 my ($type, %kv) = @_;
441 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
368} 442}
369 443
370=back 444=back
371 445
372=cut 446=cut
552 $registry = $CB_TYPE[$object_type] ||= []; 626 $registry = $CB_TYPE[$object_type] ||= [];
553 627
554 } elsif ($type eq "subtype") { 628 } elsif ($type eq "subtype") {
555 defined $object_type or Carp::croak "subtype specified without type"; 629 defined $object_type or Carp::croak "subtype specified without type";
556 my $object_subtype = shift @arg; 630 my $object_subtype = shift @arg;
557 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 631 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
558 632
559 } elsif ($type eq "package") { 633 } elsif ($type eq "package") {
560 my $pkg = shift @arg; 634 my $pkg = shift @arg;
561 635
562 while (my ($name, $id) = each %cb_id) { 636 while (my ($name, $id) = each %cb_id) {
603 if (ref $_[0]) { 677 if (ref $_[0]) {
604 _object_attach @_; 678 _object_attach @_;
605 } else { 679 } else {
606 _attach shift->_attach_registry, @_; 680 _attach shift->_attach_registry, @_;
607 } 681 }
682 _recalc_want;
608}; 683};
609 684
610# all those should be optimised 685# all those should be optimised
611sub cf::attachable::detach { 686sub cf::attachable::detach {
612 my ($obj, $name) = @_; 687 my ($obj, $name) = @_;
615 delete $obj->{_attachment}{$name}; 690 delete $obj->{_attachment}{$name};
616 reattach ($obj); 691 reattach ($obj);
617 } else { 692 } else {
618 Carp::croak "cannot, currently, detach class attachments"; 693 Carp::croak "cannot, currently, detach class attachments";
619 } 694 }
695 _recalc_want;
620}; 696};
621 697
622sub cf::attachable::attached { 698sub cf::attachable::attached {
623 my ($obj, $name) = @_; 699 my ($obj, $name) = @_;
624 700
747 $filename, length $$rdata, scalar @$objs; 823 $filename, length $$rdata, scalar @$objs;
748 824
749 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 825 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
750 chmod SAVE_MODE, $fh; 826 chmod SAVE_MODE, $fh;
751 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 827 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
752 aio_fsync $fh; 828 aio_fsync $fh if $cf::USE_FSYNC;
753 close $fh; 829 close $fh;
754 830
755 if (@$objs) { 831 if (@$objs) {
756 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 832 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
757 chmod SAVE_MODE, $fh; 833 chmod SAVE_MODE, $fh;
758 my $data = Storable::nfreeze { version => 1, objs => $objs }; 834 my $data = Storable::nfreeze { version => 1, objs => $objs };
759 aio_write $fh, 0, (length $data), $data, 0; 835 aio_write $fh, 0, (length $data), $data, 0;
760 aio_fsync $fh; 836 aio_fsync $fh if $cf::USE_FSYNC;
761 close $fh; 837 close $fh;
762 aio_rename "$filename.pst~", "$filename.pst"; 838 aio_rename "$filename.pst~", "$filename.pst";
763 } 839 }
764 } else { 840 } else {
765 aio_unlink "$filename.pst"; 841 aio_unlink "$filename.pst";
797 or return; 873 or return;
798 $av = eval { (Storable::thaw $av)->{objs} }; 874 $av = eval { (Storable::thaw $av)->{objs} };
799 } 875 }
800 876
801 warn sprintf "loading %s (%d)\n", 877 warn sprintf "loading %s (%d)\n",
802 $filename, length $data, scalar @{$av || []};#d# 878 $filename, length $data, scalar @{$av || []};
803 return ($data, $av); 879 return ($data, $av);
804} 880}
805 881
806############################################################################# 882#############################################################################
807# command handling &c 883# command handling &c
934Returns the given player object, loading it if necessary (might block). 1010Returns the given player object, loading it if necessary (might block).
935 1011
936=cut 1012=cut
937 1013
938sub playerdir($) { 1014sub playerdir($) {
939 cf::localdir 1015 "$PLAYERDIR/"
940 . "/"
941 . cf::playerdir
942 . "/"
943 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1016 . (ref $_[0] ? $_[0]->ob->name : $_[0])
944} 1017}
945 1018
946sub path($) { 1019sub path($) {
947 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1020 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
948 1021
949 (playerdir $login) . "/$login.pl" 1022 (playerdir $login) . "/playerdata"
950} 1023}
951 1024
952sub find_active($) { 1025sub find_active($) {
953 $cf::PLAYER{$_[0]} 1026 $cf::PLAYER{$_[0]}
954 and $cf::PLAYER{$_[0]}->active 1027 and $cf::PLAYER{$_[0]}->active
967 my $login = $_[0]; 1040 my $login = $_[0];
968 1041
969 my $guard = cf::lock_acquire "user_find:$login"; 1042 my $guard = cf::lock_acquire "user_find:$login";
970 1043
971 $cf::PLAYER{$_[0]} || do { 1044 $cf::PLAYER{$_[0]} || do {
1045 # rename old playerfiles to new ones
1046 #TODO: remove when no longer required
1047 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1048 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1049 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1050 aio_unlink +(playerdir $login) . "/$login.pl";
1051
972 my $pl = load_pl path $login 1052 my $pl = load_pl path $login
973 or return; 1053 or return;
974 $cf::PLAYER{$login} = $pl 1054 $cf::PLAYER{$login} = $pl
975 } 1055 }
976 } 1056 }
1013 1093
1014=cut 1094=cut
1015 1095
1016sub quit_character { 1096sub quit_character {
1017 my ($pl) = @_; 1097 my ($pl) = @_;
1098
1099 my $name = $pl->ob->name;
1018 1100
1019 $pl->{deny_save} = 1; 1101 $pl->{deny_save} = 1;
1020 $pl->password ("*"); # this should lock out the player until we nuked the dir 1102 $pl->password ("*"); # this should lock out the player until we nuked the dir
1021 1103
1022 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1104 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1027 my $path = playerdir $pl; 1109 my $path = playerdir $pl;
1028 my $temp = "$path~$cf::RUNTIME~deleting~"; 1110 my $temp = "$path~$cf::RUNTIME~deleting~";
1029 aio_rename $path, $temp; 1111 aio_rename $path, $temp;
1030 delete $cf::PLAYER{$pl->ob->name}; 1112 delete $cf::PLAYER{$pl->ob->name};
1031 $pl->destroy; 1113 $pl->destroy;
1114
1115 my $prefix = qr<^~\Q$name\E/>;
1116
1117 # nuke player maps
1118 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1119
1032 IO::AIO::aio_rmtree $temp; 1120 IO::AIO::aio_rmtree $temp;
1121}
1122
1123=item $pl->kick
1124
1125Kicks a player out of the game. This destroys the connection.
1126
1127=cut
1128
1129sub kick {
1130 my ($pl, $kicker) = @_;
1131
1132 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1133 $pl->killer ("kicked");
1134 $pl->ns->destroy;
1033} 1135}
1034 1136
1035=item cf::player::list_logins 1137=item cf::player::list_logins
1036 1138
1037Returns am arrayref of all valid playernames in the system, can take a 1139Returns am arrayref of all valid playernames in the system, can take a
1038while and may block, so not sync_job-capable, ever. 1140while and may block, so not sync_job-capable, ever.
1039 1141
1040=cut 1142=cut
1041 1143
1042sub list_logins { 1144sub list_logins {
1043 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1145 my $dirs = aio_readdir $PLAYERDIR
1044 or return []; 1146 or return [];
1045 1147
1046 my @logins; 1148 my @logins;
1047 1149
1048 for my $login (@$dirs) { 1150 for my $login (@$dirs) {
1065=cut 1167=cut
1066 1168
1067sub maps($) { 1169sub maps($) {
1068 my ($pl) = @_; 1170 my ($pl) = @_;
1069 1171
1172 $pl = ref $pl ? $pl->ob->name : $pl;
1173
1070 my $files = aio_readdir playerdir $pl 1174 my $files = aio_readdir playerdir $pl
1071 or return; 1175 or return;
1072 1176
1073 my @paths; 1177 my @paths;
1074 1178
1075 for (@$files) { 1179 for (@$files) {
1076 utf8::decode $_; 1180 utf8::decode $_;
1077 next if /\.(?:pl|pst)$/; 1181 next if /\.(?:pl|pst)$/;
1078 next unless /^$PATH_SEP/o; 1182 next unless /^$PATH_SEP/o;
1079 1183
1080 s/\.map$//; 1184 push @paths, cf::map::normalise "~$pl/$_";
1081 push @paths, "~" . $pl->ob->name . "/" . $_;
1082 } 1185 }
1083 1186
1084 \@paths 1187 \@paths
1085} 1188}
1086 1189
1087=item $player->ext_reply ($msgid, $msgtype, %msg) 1190=item $player->ext_reply ($msgid, %msg)
1088 1191
1089Sends an ext reply to the player. 1192Sends an ext reply to the player.
1090 1193
1091=cut 1194=cut
1092 1195
1093sub ext_reply($$$%) { 1196sub ext_reply($$%) {
1094 my ($self, $id, %msg) = @_; 1197 my ($self, $id, %msg) = @_;
1095 1198
1096 $msg{msgid} = $id; 1199 $msg{msgid} = $id;
1097 1200
1098 $self->send ("ext " . cf::to_json \%msg); 1201 $self->send ("ext " . cf::to_json \%msg);
1099} 1202}
1100 1203
1101package cf; 1204=item $player->ext_event ($type, %msg)
1205
1206Sends an ext event to the client.
1207
1208=cut
1209
1210sub ext_event($$%) {
1211 my ($self, $type, %msg) = @_;
1212
1213 $self->ns->ext_event ($type, %msg);
1214}
1215
1216=head3 cf::region
1217
1218=over 4
1219
1220=cut
1221
1222package cf::region;
1223
1224=item cf::region::find_by_path $path
1225
1226Tries to decuce the probable region for a map knowing only its path.
1227
1228=cut
1229
1230sub find_by_path($) {
1231 my ($path) = @_;
1232
1233 my ($match, $specificity);
1234
1235 for my $region (list) {
1236 if ($region->match && $path =~ $region->match) {
1237 ($match, $specificity) = ($region, $region->specificity)
1238 if $region->specificity > $specificity;
1239 }
1240 }
1241
1242 $match
1243}
1102 1244
1103=back 1245=back
1104
1105 1246
1106=head3 cf::map 1247=head3 cf::map
1107 1248
1108=over 4 1249=over 4
1109 1250
1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1278 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1138 (cf::region::find $rmp->{region}), $rmp->{custom} 1279 (cf::region::find $rmp->{region}), $rmp->{custom}
1139 ) 1280 )
1140} 1281}
1141 1282
1283=item cf::map->register ($regex, $prio)
1284
1285Register a handler for the map path matching the given regex at the
1286givne priority (higher is better, built-in handlers have priority 0, the
1287default).
1288
1289=cut
1290
1142sub register { 1291sub register {
1143 my (undef, $regex) = @_; 1292 my (undef, $regex, $prio) = @_;
1144 my $pkg = caller; 1293 my $pkg = caller;
1145 1294
1146 no strict; 1295 no strict;
1147 push @{"$pkg\::ISA"}, __PACKAGE__; 1296 push @{"$pkg\::ISA"}, __PACKAGE__;
1148 1297
1149 $EXT_MAP{$pkg} = qr<$regex>; 1298 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1150} 1299}
1151 1300
1152# also paths starting with '/' 1301# also paths starting with '/'
1153$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1302$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1154 1303
1155sub thawer_merge { 1304sub thawer_merge {
1156 my ($self, $merge) = @_; 1305 my ($self, $merge) = @_;
1157 1306
1158 # we have to keep some variables in memory intact 1307 # we have to keep some variables in memory intact
1159 local $self->{path}; 1308 local $self->{path};
1160 local $self->{load_path}; 1309 local $self->{load_path};
1161 local $self->{deny_save};
1162 local $self->{deny_reset};
1163 1310
1164 $self->SUPER::thawer_merge ($merge); 1311 $self->SUPER::thawer_merge ($merge);
1165} 1312}
1166 1313
1167sub normalise { 1314sub normalise {
1168 my ($path, $base) = @_; 1315 my ($path, $base) = @_;
1316
1317 $path = "$path"; # make sure its a string
1318
1319 $path =~ s/\.map$//;
1169 1320
1170 # map plan: 1321 # map plan:
1171 # 1322 #
1172 # /! non-realised random map exit (special hack!) 1323 # /! non-realised random map exit (special hack!)
1173 # {... are special paths that are not being touched 1324 # {... are special paths that are not being touched
1201 1352
1202 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1353 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1203 1354
1204 $path = normalise $path, $base; 1355 $path = normalise $path, $base;
1205 1356
1206 for my $pkg (keys %EXT_MAP) { 1357 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1207 if ($path =~ $EXT_MAP{$pkg}) { 1358 if ($path =~ $EXT_MAP{$pkg}[1]) {
1208 my $self = bless cf::map::new, $pkg; 1359 my $self = bless cf::map::new, $pkg;
1209 $self->{path} = $path; $self->path ($path); 1360 $self->{path} = $path; $self->path ($path);
1210 $self->init; # pass $1 etc. 1361 $self->init; # pass $1 etc.
1211 return $self; 1362 return $self;
1212 } 1363 }
1213 } 1364 }
1214 1365
1215 Carp::carp "unable to resolve path '$path'."; 1366 Carp::carp "unable to resolve path '$path' (base '$base').";
1216 () 1367 ()
1217} 1368}
1218 1369
1219sub init { 1370sub init {
1220 my ($self) = @_; 1371 my ($self) = @_;
1235 1386
1236# the original (read-only) location 1387# the original (read-only) location
1237sub load_path { 1388sub load_path {
1238 my ($self) = @_; 1389 my ($self) = @_;
1239 1390
1240 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1391 "$MAPDIR/$self->{path}.map"
1241} 1392}
1242 1393
1243# the temporary/swap location 1394# the temporary/swap location
1244sub save_path { 1395sub save_path {
1245 my ($self) = @_; 1396 my ($self) = @_;
1246 1397
1247 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1398 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1248 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1399 "$TMPDIR/$path.map"
1249} 1400}
1250 1401
1251# the unique path, undef == no special unique path 1402# the unique path, undef == no special unique path
1252sub uniq_path { 1403sub uniq_path {
1253 my ($self) = @_; 1404 my ($self) = @_;
1254 1405
1255 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1406 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1256 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1407 "$UNIQUEDIR/$path"
1257} 1408}
1258 1409
1259# and all this just because we cannot iterate over 1410# and all this just because we cannot iterate over
1260# all maps in C++... 1411# all maps in C++...
1261sub change_all_map_light { 1412sub change_all_map_light {
1263 1414
1264 $_->change_map_light ($change) 1415 $_->change_map_light ($change)
1265 for grep $_->outdoor, values %cf::MAP; 1416 for grep $_->outdoor, values %cf::MAP;
1266} 1417}
1267 1418
1419sub decay_objects {
1420 my ($self) = @_;
1421
1422 return if $self->{deny_reset};
1423
1424 $self->do_decay_objects;
1425}
1426
1268sub unlink_save { 1427sub unlink_save {
1269 my ($self) = @_; 1428 my ($self) = @_;
1270 1429
1271 utf8::encode (my $save = $self->save_path); 1430 utf8::encode (my $save = $self->save_path);
1272 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1431 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1275 1434
1276sub load_header_from($) { 1435sub load_header_from($) {
1277 my ($self, $path) = @_; 1436 my ($self, $path) = @_;
1278 1437
1279 utf8::encode $path; 1438 utf8::encode $path;
1280 aio_open $path, O_RDONLY, 0 1439 #aio_open $path, O_RDONLY, 0
1281 or return; 1440 # or return;
1282 1441
1283 $self->_load_header ($path) 1442 $self->_load_header ($path)
1284 or return; 1443 or return;
1285 1444
1286 $self->{load_path} = $path; 1445 $self->{load_path} = $path;
1287 1446
1288 1 1447 1
1289} 1448}
1290 1449
1291sub load_orig { 1450sub load_header_orig {
1292 my ($self) = @_; 1451 my ($self) = @_;
1293 1452
1294 $self->load_header_from ($self->load_path) 1453 $self->load_header_from ($self->load_path)
1295} 1454}
1296 1455
1297sub load_temp { 1456sub load_header_temp {
1298 my ($self) = @_; 1457 my ($self) = @_;
1299 1458
1300 $self->load_header_from ($self->save_path) 1459 $self->load_header_from ($self->save_path)
1460}
1461
1462sub prepare_temp {
1463 my ($self) = @_;
1464
1465 $self->last_access ((delete $self->{last_access})
1466 || $cf::RUNTIME); #d#
1467 # safety
1468 $self->{instantiate_time} = $cf::RUNTIME
1469 if $self->{instantiate_time} > $cf::RUNTIME;
1470}
1471
1472sub prepare_orig {
1473 my ($self) = @_;
1474
1475 $self->{load_original} = 1;
1476 $self->{instantiate_time} = $cf::RUNTIME;
1477 $self->last_access ($cf::RUNTIME);
1478 $self->instantiate;
1301} 1479}
1302 1480
1303sub load_header { 1481sub load_header {
1304 my ($self) = @_; 1482 my ($self) = @_;
1305 1483
1306 if ($self->load_temp) { 1484 if ($self->load_header_temp) {
1307 $self->last_access ((delete $self->{last_access}) 1485 $self->prepare_temp;
1308 || $cf::RUNTIME); #d#
1309 # safety
1310 $self->{instantiate_time} = $cf::RUNTIME
1311 if $self->{instantiate_time} > $cf::RUNTIME;
1312 } else { 1486 } else {
1313 $self->load_orig 1487 $self->load_header_orig
1314 or return; 1488 or return;
1315 1489 $self->prepare_orig;
1316 $self->{load_original} = 1;
1317 $self->{instantiate_time} = $cf::RUNTIME;
1318 $self->last_access ($cf::RUNTIME);
1319 $self->instantiate;
1320 } 1490 }
1491
1492 $self->{deny_reset} = 1
1493 if $self->no_reset;
1494
1495 $self->default_region (cf::region::find_by_path $self->{path})
1496 unless $self->default_region;
1321 1497
1322 1 1498 1
1323} 1499}
1324 1500
1325sub find; 1501sub find;
1338 $map->{last_save} = $cf::RUNTIME; 1514 $map->{last_save} = $cf::RUNTIME;
1339 1515
1340 $map->load_header 1516 $map->load_header
1341 or return; 1517 or return;
1342 1518
1343 if ($map->should_reset) { 1519 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1520 # doing this can freeze the server in a sync job, obviously
1344 $cf::WAIT_FOR_TICK->wait; 1521 #$cf::WAIT_FOR_TICK->wait;
1345 $map->reset; 1522 $map->reset;
1346 undef $guard; 1523 undef $guard;
1347 $map = find $path 1524 return find $path;
1348 or return;
1349 } 1525 }
1350 1526
1351 $cf::MAP{$path} = $map 1527 $cf::MAP{$path} = $map
1352 } 1528 }
1353} 1529}
1530
1531sub pre_load { }
1532sub post_load { }
1354 1533
1355sub load { 1534sub load {
1356 my ($self) = @_; 1535 my ($self) = @_;
1357 1536
1537 local $self->{deny_reset} = 1; # loading can take a long time
1538
1358 my $path = $self->{path}; 1539 my $path = $self->{path};
1540
1541 {
1359 my $guard = cf::lock_acquire "map_load:$path"; 1542 my $guard = cf::lock_acquire "map_load:$path";
1360 1543
1361 return if $self->in_memory != cf::MAP_SWAPPED; 1544 return if $self->in_memory != cf::MAP_SWAPPED;
1362 1545
1363 $self->in_memory (cf::MAP_LOADING); 1546 $self->in_memory (cf::MAP_LOADING);
1364 1547
1365 $self->alloc; 1548 $self->alloc;
1366 $self->_load_objects ($self->{load_path}, 1)
1367 or return;
1368 1549
1369 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1550 $self->pre_load;
1370 if delete $self->{load_original};
1371
1372 if (my $uniq = $self->uniq_path) {
1373 utf8::encode $uniq;
1374 if (aio_open $uniq, O_RDONLY, 0) {
1375 $self->clear_unique_items;
1376 $self->_load_objects ($uniq, 0);
1377 }
1378 }
1379
1380 Coro::cede;
1381
1382 # now do the right thing for maps
1383 $self->link_multipart_objects;
1384
1385 unless ($self->{deny_activate}) {
1386 $self->decay_objects;
1387 $self->fix_auto_apply;
1388 $self->update_buttons;
1389 Coro::cede; 1551 Coro::cede;
1390 $self->set_darkness_map; 1552
1553 $self->_load_objects ($self->{load_path}, 1)
1554 or return;
1555
1556 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1557 if delete $self->{load_original};
1558
1559 if (my $uniq = $self->uniq_path) {
1560 utf8::encode $uniq;
1561 if (aio_open $uniq, O_RDONLY, 0) {
1562 $self->clear_unique_items;
1563 $self->_load_objects ($uniq, 0);
1564 }
1565 }
1566
1567 Coro::cede;
1568 # now do the right thing for maps
1569 $self->link_multipart_objects;
1391 $self->difficulty ($self->estimate_difficulty) 1570 $self->difficulty ($self->estimate_difficulty)
1392 unless $self->difficulty; 1571 unless $self->difficulty;
1393 Coro::cede; 1572 Coro::cede;
1573
1574 unless ($self->{deny_activate}) {
1575 $self->decay_objects;
1576 $self->fix_auto_apply;
1577 $self->update_buttons;
1578 Coro::cede;
1579 $self->set_darkness_map;
1580 Coro::cede;
1394 $self->activate; 1581 $self->activate;
1395 } 1582 }
1396 1583
1397 $self->in_memory (cf::MAP_IN_MEMORY); 1584 $self->in_memory (cf::MAP_IN_MEMORY);
1585 }
1586
1587 $self->post_load;
1398} 1588}
1399 1589
1400sub customise_for { 1590sub customise_for {
1401 my ($self, $ob) = @_; 1591 my ($self, $ob) = @_;
1402 1592
1403 return find "~" . $ob->name . "/" . $self->{path} 1593 return find "~" . $ob->name . "/" . $self->{path}
1404 if $self->per_player; 1594 if $self->per_player;
1595
1596# return find "?party/" . $ob->name . "/" . $self->{path}
1597# if $self->per_party;
1405 1598
1406 $self 1599 $self
1407} 1600}
1408 1601
1409# find and load all maps in the 3x3 area around a map 1602# find and load all maps in the 3x3 area around a map
1456 1649
1457 undef $MAP_PREFETCH{$path}; 1650 undef $MAP_PREFETCH{$path};
1458 $MAP_PREFETCHER ||= cf::async { 1651 $MAP_PREFETCHER ||= cf::async {
1459 while (%MAP_PREFETCH) { 1652 while (%MAP_PREFETCH) {
1460 for my $path (keys %MAP_PREFETCH) { 1653 for my $path (keys %MAP_PREFETCH) {
1461 warn "prefetching $path...\n";#d#
1462 my $map = find $path 1654 my $map = find $path
1463 or next; 1655 or next;
1464 $map->load; 1656 $map->load;
1465 1657
1466 delete $MAP_PREFETCH{$path}; 1658 delete $MAP_PREFETCH{$path};
1467 } 1659 }
1468 } 1660 }
1469 undef $MAP_PREFETCHER; 1661 undef $MAP_PREFETCHER;
1470 }; 1662 };
1663 $MAP_PREFETCHER->prio (6);
1471 1664
1472 () 1665 ()
1473} 1666}
1474 1667
1475sub save { 1668sub save {
1520 1713
1521sub reset_at { 1714sub reset_at {
1522 my ($self) = @_; 1715 my ($self) = @_;
1523 1716
1524 # TODO: safety, remove and allow resettable per-player maps 1717 # TODO: safety, remove and allow resettable per-player maps
1525 return 1e99 if $self->isa ("ext::map_per_player");#d#
1526 return 1e99 if $self->{deny_reset}; 1718 return 1e99 if $self->{deny_reset};
1527 1719
1528 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1720 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1529 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1721 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1530 1722
1541 my ($self) = @_; 1733 my ($self) = @_;
1542 1734
1543 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1735 my $lock = cf::lock_acquire "map_data:$self->{path}";
1544 1736
1545 return if $self->players; 1737 return if $self->players;
1546 return if $self->isa ("ext::map_per_player");#d#
1547 1738
1548 warn "resetting map ", $self->path;#d# 1739 warn "resetting map ", $self->path;
1740
1741 $self->in_memory (cf::MAP_SWAPPED);
1742
1743 # need to save uniques path
1744 unless ($self->{deny_save}) {
1745 my $uniq = $self->uniq_path; utf8::encode $uniq;
1746
1747 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1748 if $uniq;
1749 }
1549 1750
1550 delete $cf::MAP{$self->path}; 1751 delete $cf::MAP{$self->path};
1551 1752
1552 $self->in_memory (cf::MAP_SWAPPED);
1553 $self->clear; 1753 $self->clear;
1554 1754
1555 $_->clear_links_to ($self) for values %cf::MAP; 1755 $_->clear_links_to ($self) for values %cf::MAP;
1556 1756
1557 $self->unlink_save; 1757 $self->unlink_save;
1576 $cf::MAP{$self->path} = $self; 1776 $cf::MAP{$self->path} = $self;
1577 1777
1578 $self->reset; # polite request, might not happen 1778 $self->reset; # polite request, might not happen
1579} 1779}
1580 1780
1781=item $maps = cf::map::tmp_maps
1782
1783Returns an arrayref with all map paths of currently instantiated and saved
1784maps.
1785
1786=cut
1787
1788sub tmp_maps() {
1789 [
1790 map {
1791 utf8::decode $_;
1792 !/\.(?:pst|meta)$/ && /^$PATH_SEP/o
1793 ? normalise $_
1794 : ()
1795 } @{ aio_readdir $TMPDIR or [] }
1796 ]
1797}
1798
1581=item cf::map::unique_maps 1799=item cf::map::unique_maps
1582 1800
1583Returns an arrayref of paths of all shared maps that have 1801Returns an arrayref of paths of all shared maps that have
1584instantiated unique items. May block. 1802instantiated unique items. May block.
1585 1803
1586=cut 1804=cut
1587 1805
1588sub unique_maps() { 1806sub unique_maps() {
1589 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 1807 [
1590 or return; 1808 map {
1591
1592 my @paths;
1593
1594 for (@$files) {
1595 utf8::decode $_; 1809 utf8::decode $_;
1596 next if /\.pst$/; 1810 !/\.(?:pst|meta)$/ && /^$PATH_SEP/o
1597 next unless /^$PATH_SEP/o; 1811 ? normalise $_
1598 1812 : ()
1599 s/\.map$//; 1813 } @{ aio_readdir $UNIQUEDIR or [] }
1600 push @paths, $_;
1601 } 1814 ]
1602
1603 \@paths
1604} 1815}
1605 1816
1606package cf; 1817package cf;
1607 1818
1608=back 1819=back
1699=cut 1910=cut
1700 1911
1701sub link_map { 1912sub link_map {
1702 unless ($LINK_MAP) { 1913 unless ($LINK_MAP) {
1703 $LINK_MAP = cf::map::find "{link}" 1914 $LINK_MAP = cf::map::find "{link}"
1704 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1915 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1705 $LINK_MAP->load; 1916 $LINK_MAP->load;
1706 } 1917 }
1707 1918
1708 $LINK_MAP 1919 $LINK_MAP
1709} 1920}
1714 $self->deactivate_recursive; 1925 $self->deactivate_recursive;
1715 1926
1716 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1927 return if UNIVERSAL::isa $self->map, "ext::map_link";
1717 1928
1718 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1929 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1719 if $self->map; 1930 if $self->map && $self->map->{path} ne "{link}";
1720 1931
1721 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1932 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1722} 1933}
1723 1934
1724sub cf::object::player::leave_link { 1935sub cf::object::player::leave_link {
1725 my ($self, $map, $x, $y) = @_; 1936 my ($self, $map, $x, $y) = @_;
1937
1938 return unless $self->contr->active;
1726 1939
1727 my $link_pos = delete $self->{_link_pos}; 1940 my $link_pos = delete $self->{_link_pos};
1728 1941
1729 unless ($map) { 1942 unless ($map) {
1730 # restore original map position 1943 # restore original map position
1748 $map->load; 1961 $map->load;
1749 $map->load_diag; 1962 $map->load_diag;
1750 1963
1751 return unless $self->contr->active; 1964 return unless $self->contr->active;
1752 $self->activate_recursive; 1965 $self->activate_recursive;
1966
1967 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1753 $self->enter_map ($map, $x, $y); 1968 $self->enter_map ($map, $x, $y);
1754} 1969}
1755 1970
1756cf::player->attach (
1757 on_logout => sub {
1758 my ($pl) = @_;
1759
1760 # abort map switching before logout
1761 if ($pl->ob->{_link_pos}) {
1762 cf::sync_job {
1763 $pl->ob->leave_link
1764 };
1765 }
1766 },
1767 on_login => sub {
1768 my ($pl) = @_;
1769
1770 # try to abort aborted map switching on player login :)
1771 # should happen only on crashes
1772 if ($pl->ob->{_link_pos}) {
1773 $pl->ob->enter_link;
1774 (async {
1775 # we need this sleep as the login has a concurrent enter_exit running
1776 # and this sleep increases chances of the player not ending up in scorn
1777 $pl->ob->reply (undef,
1778 "There was an internal problem at your last logout, "
1779 . "the server will try to bring you to your intended destination in a second.",
1780 cf::NDI_RED);
1781 Coro::Timer::sleep 1;
1782 $pl->ob->leave_link;
1783 })->prio (2);
1784 }
1785 },
1786);
1787
1788=item $player_object->goto ($path, $x, $y) 1971=item $player_object->goto ($path, $x, $y[, $check->($map)])
1789 1972
1973Moves the player to the given map-path and coordinates by first freezing
1974her, loading and preparing them map, calling the provided $check callback
1975that has to return the map if sucecssful, and then unfreezes the player on
1976the new (success) or old (failed) map position.
1977
1790=cut 1978=cut
1979
1980our $GOTOGEN;
1791 1981
1792sub cf::object::player::goto { 1982sub cf::object::player::goto {
1793 my ($self, $path, $x, $y) = @_; 1983 my ($self, $path, $x, $y, $check) = @_;
1984
1985 # do generation counting so two concurrent goto's will be executed in-order
1986 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1794 1987
1795 $self->enter_link; 1988 $self->enter_link;
1796 1989
1797 (async { 1990 (async {
1991 my $map = eval {
1798 my $map = cf::map::find $path; 1992 my $map = cf::map::find $path;
1993
1994 if ($map) {
1799 $map = $map->customise_for ($self) if $map; 1995 $map = $map->customise_for ($self);
1800 1996 $map = $check->($map) if $check && $map;
1801# warn "entering ", $map->path, " at ($x, $y)\n" 1997 } else {
1802# if $map;
1803
1804 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1998 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1999 }
1805 2000
2001 $map
2002 };
2003
2004 if ($@) {
2005 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2006 LOG llevError | logBacktrace, Carp::longmess $@;
2007 }
2008
2009 if ($gen == $self->{_goto_generation}) {
2010 delete $self->{_goto_generation};
1806 $self->leave_link ($map, $x, $y); 2011 $self->leave_link ($map, $x, $y);
2012 }
1807 })->prio (1); 2013 })->prio (1);
1808} 2014}
1809 2015
1810=item $player_object->enter_exit ($exit_object) 2016=item $player_object->enter_exit ($exit_object)
1811 2017
1840 # that depends on the exit object 2046 # that depends on the exit object
1841 2047
1842 my $rmp = parse_random_map_params $exit->msg; 2048 my $rmp = parse_random_map_params $exit->msg;
1843 2049
1844 if ($exit->map) { 2050 if ($exit->map) {
1845 $rmp->{region} = $exit->map->region_name; 2051 $rmp->{region} = $exit->region->name;
1846 $rmp->{origin_map} = $exit->map->path; 2052 $rmp->{origin_map} = $exit->map->path;
1847 $rmp->{origin_x} = $exit->x; 2053 $rmp->{origin_x} = $exit->x;
1848 $rmp->{origin_y} = $exit->y; 2054 $rmp->{origin_y} = $exit->y;
1849 } 2055 }
1850 2056
1851 $rmp->{random_seed} ||= $exit->random_seed; 2057 $rmp->{random_seed} ||= $exit->random_seed;
1852 2058
1853 my $data = cf::to_json $rmp; 2059 my $data = cf::to_json $rmp;
1854 my $md5 = Digest::MD5::md5_hex $data; 2060 my $md5 = Digest::MD5::md5_hex $data;
1855 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2061 my $meta = "$RANDOMDIR/$md5.meta";
1856 2062
1857 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2063 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1858 aio_write $fh, 0, (length $data), $data, 0; 2064 aio_write $fh, 0, (length $data), $data, 0;
1859 undef $fh; 2065 undef $fh;
1860 aio_rename "$meta~", $meta; 2066 aio_rename "$meta~", $meta;
1867sub cf::object::player::enter_exit { 2073sub cf::object::player::enter_exit {
1868 my ($self, $exit) = @_; 2074 my ($self, $exit) = @_;
1869 2075
1870 return unless $self->type == cf::PLAYER; 2076 return unless $self->type == cf::PLAYER;
1871 2077
2078 if ($exit->slaying eq "/!") {
2079 #TODO: this should de-fi-ni-te-ly not be a sync-job
2080 # the problem is that $exit might not survive long enough
2081 # so it needs to be done right now, right here
2082 cf::sync_job { prepare_random_map $exit };
2083 }
2084
2085 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2086 my $hp = $exit->stats->hp;
2087 my $sp = $exit->stats->sp;
2088
1872 $self->enter_link; 2089 $self->enter_link;
1873 2090
1874 (async { 2091 (async {
1875 $self->deactivate_recursive; # just to be sure 2092 $self->deactivate_recursive; # just to be sure
1876 unless (eval { 2093 unless (eval {
1877 prepare_random_map $exit 2094 $self->goto ($slaying, $hp, $sp);
1878 if $exit->slaying eq "/!";
1879
1880 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1881 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1882 2095
1883 1; 2096 1;
1884 }) { 2097 }) {
1885 $self->message ("Something went wrong deep within the crossfire server. " 2098 $self->message ("Something went wrong deep within the crossfire server. "
1886 . "I'll try to bring you back to the map you were before. " 2099 . "I'll try to bring you back to the map you were before. "
1887 . "Please report this to the dungeon master!", 2100 . "Please report this to the dungeon master!",
1888 cf::NDI_UNIQUE | cf::NDI_RED); 2101 cf::NDI_UNIQUE | cf::NDI_RED);
1889 2102
1890 warn "ERROR in enter_exit: $@"; 2103 warn "ERROR in enter_exit: $@";
1891 $self->leave_link; 2104 $self->leave_link;
1892 } 2105 }
1893 })->prio (1); 2106 })->prio (1);
1906 2119
1907sub cf::client::send_drawinfo { 2120sub cf::client::send_drawinfo {
1908 my ($self, $text, $flags) = @_; 2121 my ($self, $text, $flags) = @_;
1909 2122
1910 utf8::encode $text; 2123 utf8::encode $text;
1911 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2124 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1912} 2125}
1913 2126
2127=item $client->ext_event ($type, %msg)
2128
2129Sends an exti event to the client.
2130
2131=cut
2132
2133sub cf::client::ext_event($$%) {
2134 my ($self, $type, %msg) = @_;
2135
2136 $msg{msgtype} = "event_$type";
2137 $self->send_packet ("ext " . cf::to_json \%msg);
2138}
1914 2139
1915=item $success = $client->query ($flags, "text", \&cb) 2140=item $success = $client->query ($flags, "text", \&cb)
1916 2141
1917Queues a query to the client, calling the given callback with 2142Queues a query to the client, calling the given callback with
1918the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2143the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
1947 # get handled first 2172 # get handled first
1948 my $queue = delete $ns->{query_queue} 2173 my $queue = delete $ns->{query_queue}
1949 or return; # be conservative, not sure how that can happen, but we saw a crash here 2174 or return; # be conservative, not sure how that can happen, but we saw a crash here
1950 2175
1951 (shift @$queue)->[1]->($msg); 2176 (shift @$queue)->[1]->($msg);
2177 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1952 2178
1953 push @{ $ns->{query_queue} }, @$queue; 2179 push @{ $ns->{query_queue} }, @$queue;
1954 2180
1955 if (@{ $ns->{query_queue} } == @$queue) { 2181 if (@{ $ns->{query_queue} } == @$queue) {
1956 if (@$queue) { 2182 if (@$queue) {
2014 2240
2015# here we export the classes and methods available to script code 2241# here we export the classes and methods available to script code
2016 2242
2017=pod 2243=pod
2018 2244
2019The following fucntions and emthods are available within a safe environment: 2245The following functions and methods are available within a safe environment:
2020 2246
2021 cf::object contr pay_amount pay_player map 2247 cf::object contr pay_amount pay_player map
2022 cf::object::player player 2248 cf::object::player player
2023 cf::player peaceful 2249 cf::player peaceful
2024 cf::map trigger 2250 cf::map trigger
2109############################################################################# 2335#############################################################################
2110 2336
2111=head2 EXTENSION DATABASE SUPPORT 2337=head2 EXTENSION DATABASE SUPPORT
2112 2338
2113Crossfire maintains a very simple database for extension use. It can 2339Crossfire maintains a very simple database for extension use. It can
2114currently store anything that can be serialised using Storable, which 2340currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2115excludes objects. 2341convert to/from binary).
2116 2342
2117The parameter C<$family> should best start with the name of the extension 2343The parameter C<$family> should best start with the name of the extension
2118using it, it should be unique. 2344using it, it should be unique.
2119 2345
2120=over 4 2346=over 4
2121 2347
2122=item $hashref = cf::db_get $family
2123
2124Return a hashref for use by the extension C<$family>, which can be
2125modified. After modifications, you have to call C<cf::db_dirty> or
2126C<cf::db_sync>.
2127
2128=item $value = cf::db_get $family => $key 2348=item $value = cf::db_get $family => $key
2129 2349
2130Returns a single value from the database 2350Returns a single value from the database.
2131
2132=item cf::db_put $family => $hashref
2133
2134Stores the given family hashref into the database. Updates are delayed, if
2135you want the data to be synced to disk immediately, use C<cf::db_sync>.
2136 2351
2137=item cf::db_put $family => $key => $value 2352=item cf::db_put $family => $key => $value
2138 2353
2139Stores the given C<$value> in the family hash. Updates are delayed, if you 2354Stores the given C<$value> in the family.
2140want the data to be synced to disk immediately, use C<cf::db_sync>.
2141
2142=item cf::db_dirty
2143
2144Marks the database as dirty, to be updated at a later time.
2145
2146=item cf::db_sync
2147
2148Immediately write the database to disk I<if it is dirty>.
2149 2355
2150=cut 2356=cut
2151 2357
2152our $DB; 2358our $DB;
2153 2359
2154{ 2360sub db_init {
2155 my $path = cf::localdir . "/database.pst"; 2361 unless ($DB) {
2362 $DB = BDB::db_create $DB_ENV;
2156 2363
2157 sub db_load() { 2364 cf::sync_job {
2158 $DB = stat $path ? Storable::retrieve $path : { }; 2365 eval {
2159 } 2366 $DB->set_flags (BDB::CHKSUM);
2160 2367
2161 my $pid; 2368 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2162 2369 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2163 sub db_save() { 2370 cf::cleanup "db_open(db): $!" if $!;
2164 waitpid $pid, 0 if $pid; 2371 };
2165 if (0 == ($pid = fork)) { 2372 cf::cleanup "db_open(db): $@" if $@;
2166 $DB->{_meta}{version} = 1;
2167 Storable::nstore $DB, "$path~";
2168 rename "$path~", $path;
2169 cf::_exit 0 if defined $pid;
2170 } 2373 };
2171 }
2172
2173 my $dirty;
2174
2175 sub db_sync() {
2176 db_save if $dirty;
2177 undef $dirty;
2178 }
2179
2180 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2181 db_sync;
2182 }); 2374 }
2375}
2183 2376
2184 sub db_dirty() {
2185 $dirty = 1;
2186 $idle->start;
2187 }
2188
2189 sub db_get($;$) { 2377sub db_get($$) {
2190 @_ >= 2 2378 my $key = "$_[0]/$_[1]";
2191 ? $DB->{$_[0]}{$_[1]}
2192 : ($DB->{$_[0]} ||= { })
2193 }
2194 2379
2380 cf::sync_job {
2381 BDB::db_get $DB, undef, $key, my $data;
2382
2383 $! ? ()
2384 : $data
2385 }
2386}
2387
2195 sub db_put($$;$) { 2388sub db_put($$$) {
2196 if (@_ >= 3) { 2389 BDB::dbreq_pri 4;
2197 $DB->{$_[0]}{$_[1]} = $_[2]; 2390 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2198 } else { 2391}
2199 $DB->{$_[0]} = $_[1];
2200 }
2201 db_dirty;
2202 }
2203 2392
2204 cf::global->attach ( 2393=item cf::cache $id => [$paths...], $processversion => $process
2205 prio => 10000, 2394
2206 on_cleanup => sub { 2395Generic caching function that returns the value of the resource $id,
2207 db_sync; 2396caching and regenerating as required.
2397
2398This function can block.
2399
2400=cut
2401
2402sub cache {
2403 my ($id, $src, $processversion, $process) = @_;
2404
2405 my $meta =
2406 join "\x00",
2407 $processversion,
2408 map {
2409 aio_stat $_
2410 and Carp::croak "$_: $!";
2411
2412 ($_, (stat _)[7,9])
2413 } @$src;
2414
2415 my $dbmeta = db_get cache => "$id/meta";
2416 if ($dbmeta ne $meta) {
2417 # changed, we may need to process
2418
2419 my @data;
2420 my $md5;
2421
2422 for (0 .. $#$src) {
2423 0 <= aio_load $src->[$_], $data[$_]
2424 or Carp::croak "$src->[$_]: $!";
2208 }, 2425 }
2209 ); 2426
2427 # if processing is expensive, check
2428 # checksum first
2429 if (1) {
2430 $md5 =
2431 join "\x00",
2432 $processversion,
2433 map {
2434 Coro::cede;
2435 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2436 } 0.. $#$src;
2437
2438
2439 my $dbmd5 = db_get cache => "$id/md5";
2440 if ($dbmd5 eq $md5) {
2441 db_put cache => "$id/meta", $meta;
2442
2443 return db_get cache => "$id/data";
2444 }
2445 }
2446
2447 my $t1 = Time::HiRes::time;
2448 my $data = $process->(\@data);
2449 my $t2 = Time::HiRes::time;
2450
2451 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2452
2453 db_put cache => "$id/data", $data;
2454 db_put cache => "$id/md5" , $md5;
2455 db_put cache => "$id/meta", $meta;
2456
2457 return $data;
2458 }
2459
2460 db_get cache => "$id/data"
2461}
2462
2463=item fork_call { }, $args
2464
2465Executes the given code block with the given arguments in a seperate
2466process, returning the results. Everything must be serialisable with
2467Coro::Storable. May, of course, block. Note that the executed sub may
2468never block itself or use any form of Event handling.
2469
2470=cut
2471
2472sub fork_call(&@) {
2473 my ($cb, @args) = @_;
2474
2475# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2476# or die "socketpair: $!";
2477 pipe my $fh1, my $fh2
2478 or die "pipe: $!";
2479
2480 if (my $pid = fork) {
2481 close $fh2;
2482
2483 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2484 $res = Coro::Storable::thaw $res;
2485
2486 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2487
2488 die $$res unless "ARRAY" eq ref $res;
2489
2490 return wantarray ? @$res : $res->[-1];
2491 } else {
2492 reset_signals;
2493 local $SIG{__WARN__};
2494 local $SIG{__DIE__};
2495 eval {
2496 close $fh1;
2497
2498 my @res = eval { $cb->(@args) };
2499 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2500 };
2501
2502 warn $@ if $@;
2503 _exit 0;
2504 }
2210} 2505}
2211 2506
2212############################################################################# 2507#############################################################################
2213# the server's main() 2508# the server's init and main functions
2509
2510sub load_facedata($) {
2511 my ($path) = @_;
2512
2513 warn "loading facedata from $path\n";
2514
2515 my $facedata;
2516 0 < aio_load $path, $facedata
2517 or die "$path: $!";
2518
2519 $facedata = Coro::Storable::thaw $facedata;
2520
2521 $facedata->{version} == 2
2522 or cf::cleanup "$path: version mismatch, cannot proceed.";
2523
2524 {
2525 my $faces = $facedata->{faceinfo};
2526
2527 while (my ($face, $info) = each %$faces) {
2528 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2529 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2530 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2531 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2532 Coro::cede;
2533 }
2534
2535 while (my ($face, $info) = each %$faces) {
2536 next unless $info->{smooth};
2537 my $idx = cf::face::find $face
2538 or next;
2539 if (my $smooth = cf::face::find $info->{smooth}) {
2540 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2541 } else {
2542 warn "smooth face '$info->{smooth}' not found for face '$face'";
2543 }
2544 Coro::cede;
2545 }
2546 }
2547
2548 {
2549 my $anims = $facedata->{animinfo};
2550
2551 while (my ($anim, $info) = each %$anims) {
2552 cf::anim::set $anim, $info->{frames}, $info->{facings};
2553 Coro::cede;
2554 }
2555
2556 cf::anim::invalidate_all; # d'oh
2557 }
2558
2559 1
2560}
2561
2562sub reload_regions {
2563 load_resource_file "$MAPDIR/regions"
2564 or die "unable to load regions file\n";
2565}
2566
2567sub reload_facedata {
2568 load_facedata "$DATADIR/facedata"
2569 or die "unable to load facedata\n";
2570}
2571
2572sub reload_archetypes {
2573 load_resource_file "$DATADIR/archetypes"
2574 or die "unable to load archetypes\n";
2575}
2576
2577sub reload_treasures {
2578 load_resource_file "$DATADIR/treasures"
2579 or die "unable to load treasurelists\n";
2580}
2581
2582sub reload_resources {
2583 warn "reloading resource files...\n";
2584
2585 reload_regions;
2586 reload_facedata;
2587 #reload_archetypes;#d#
2588 reload_archetypes;
2589 reload_treasures;
2590
2591 warn "finished reloading resource files\n";
2592}
2593
2594sub init {
2595 reload_resources;
2596}
2214 2597
2215sub cfg_load { 2598sub cfg_load {
2216 open my $fh, "<:utf8", cf::confdir . "/config" 2599 open my $fh, "<:utf8", "$CONFDIR/config"
2217 or return; 2600 or return;
2218 2601
2219 local $/; 2602 local $/;
2220 *CFG = YAML::Syck::Load <$fh>; 2603 *CFG = YAML::Syck::Load <$fh>;
2221 2604
2241 Event::one_event; 2624 Event::one_event;
2242 })->prio (Coro::PRIO_MAX); 2625 })->prio (Coro::PRIO_MAX);
2243 }; 2626 };
2244 2627
2245 cfg_load; 2628 cfg_load;
2246 db_load; 2629 db_init;
2247 load_extensions; 2630 load_extensions;
2248 2631
2249 $TICK_WATCHER->start; 2632 $TICK_WATCHER->start;
2250 Event::loop; 2633 Event::loop;
2251} 2634}
2255 2638
2256# install some emergency cleanup handlers 2639# install some emergency cleanup handlers
2257BEGIN { 2640BEGIN {
2258 for my $signal (qw(INT HUP TERM)) { 2641 for my $signal (qw(INT HUP TERM)) {
2259 Event->signal ( 2642 Event->signal (
2643 reentrant => 0,
2260 data => WF_AUTOCANCEL, 2644 data => WF_AUTOCANCEL,
2261 signal => $signal, 2645 signal => $signal,
2646 prio => 0,
2262 cb => sub { 2647 cb => sub {
2263 cf::cleanup "SIG$signal"; 2648 cf::cleanup "SIG$signal";
2264 }, 2649 },
2265 ); 2650 );
2266 } 2651 }
2267} 2652}
2288 my $map = $cf::MAP{$path} or next; 2673 my $map = $cf::MAP{$path} or next;
2289 $map->valid or next; 2674 $map->valid or next;
2290 $map->save; 2675 $map->save;
2291 } 2676 }
2292 warn "end emergency map save\n"; 2677 warn "end emergency map save\n";
2678
2679 warn "begin emergency database checkpoint\n";
2680 BDB::db_env_txn_checkpoint $DB_ENV;
2681 warn "end emergency database checkpoint\n";
2293 }; 2682 };
2294 2683
2295 warn "leave emergency perl save\n"; 2684 warn "leave emergency perl save\n";
2296} 2685}
2297 2686
2687sub post_cleanup {
2688 my ($make_core) = @_;
2689
2690 warn Carp::longmess "post_cleanup backtrace"
2691 if $make_core;
2692}
2693
2298sub reload() { 2694sub do_reload_perl() {
2299 # can/must only be called in main 2695 # can/must only be called in main
2300 if ($Coro::current != $Coro::main) { 2696 if ($Coro::current != $Coro::main) {
2301 warn "can only reload from main coroutine"; 2697 warn "can only reload from main coroutine";
2302 return; 2698 return;
2303 } 2699 }
2304 2700
2305 warn "reloading..."; 2701 warn "reloading...";
2306 2702
2307 warn "cancelling server ticker"; 2703 warn "entering sync_job";
2308 $TICK_WATCHER->cancel;
2309 2704
2705 cf::sync_job {
2706 cf::write_runtime; # external watchdog should not bark
2310 cf::emergency_save; 2707 cf::emergency_save;
2708 cf::write_runtime; # external watchdog should not bark
2311 2709
2312 eval { 2710 warn "syncing database to disk";
2711 BDB::db_env_txn_checkpoint $DB_ENV;
2712
2313 # if anything goes wrong in here, we should simply crash as we already saved 2713 # if anything goes wrong in here, we should simply crash as we already saved
2314
2315 warn "syncing database to disk";
2316 cf::db_sync;
2317 2714
2318 warn "cancelling all WF_AUTOCANCEL watchers"; 2715 warn "cancelling all WF_AUTOCANCEL watchers";
2319 for (Event::all_watchers) { 2716 for (Event::all_watchers) {
2320 $_->cancel if $_->data & WF_AUTOCANCEL; 2717 $_->cancel if $_->data & WF_AUTOCANCEL;
2321 } 2718 }
2322 2719
2323 warn "flushing outstanding aio requests"; 2720 warn "flushing outstanding aio requests";
2324 for (;;) { 2721 for (;;) {
2722 BDB::flush;
2325 IO::AIO::flush; 2723 IO::AIO::flush;
2326 Coro::cede; 2724 Coro::cede;
2327 last unless IO::AIO::nreqs; 2725 last unless IO::AIO::nreqs || BDB::nreqs;
2328 warn "iterate..."; 2726 warn "iterate...";
2329 } 2727 }
2728
2729 ++$RELOAD;
2330 2730
2331 warn "cancelling all extension coros"; 2731 warn "cancelling all extension coros";
2332 $_->cancel for values %EXT_CORO; 2732 $_->cancel for values %EXT_CORO;
2333 %EXT_CORO = (); 2733 %EXT_CORO = ();
2334 2734
2374 Symbol::delete_package "safe::$_" 2774 Symbol::delete_package "safe::$_"
2375 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2775 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2376 2776
2377 warn "unloading cf.pm \"a bit\""; 2777 warn "unloading cf.pm \"a bit\"";
2378 delete $INC{"cf.pm"}; 2778 delete $INC{"cf.pm"};
2779 delete $INC{"cf/pod.pm"};
2379 2780
2380 # don't, removes xs symbols, too, 2781 # don't, removes xs symbols, too,
2381 # and global variables created in xs 2782 # and global variables created in xs
2382 #Symbol::delete_package __PACKAGE__; 2783 #Symbol::delete_package __PACKAGE__;
2383 2784
2387 require cf; 2788 require cf;
2388 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2789 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2389 2790
2390 warn "loading config and database again"; 2791 warn "loading config and database again";
2391 cf::cfg_load; 2792 cf::cfg_load;
2392 cf::db_load;
2393 2793
2394 warn "loading extensions"; 2794 warn "loading extensions";
2395 cf::load_extensions; 2795 cf::load_extensions;
2396 2796
2397 warn "reattaching attachments to objects/players"; 2797 warn "reattaching attachments to objects/players";
2398 _global_reattach; 2798 _global_reattach; # objects, sockets
2399 warn "reattaching attachments to maps"; 2799 warn "reattaching attachments to maps";
2400 reattach $_ for values %MAP; 2800 reattach $_ for values %MAP;
2801 warn "reattaching attachments to players";
2802 reattach $_ for values %PLAYER;
2401 2803
2402 warn "restarting server ticker"; 2804 warn "leaving sync_job";
2403 2805
2404 $TICK_WATCHER->start; 2806 1
2405 }; 2807 } or do {
2406
2407 if ($@) {
2408 warn $@; 2808 warn $@;
2409 warn "error while reloading, exiting."; 2809 warn "error while reloading, exiting.";
2410 exit 1; 2810 exit 1;
2411 } 2811 };
2412 2812
2413 warn "reloaded"; 2813 warn "reloaded";
2414}; 2814};
2415 2815
2416our $RELOAD_WATCHER; # used only during reload 2816our $RELOAD_WATCHER; # used only during reload
2417 2817
2818sub reload_perl() {
2819 # doing reload synchronously and two reloads happen back-to-back,
2820 # coro crashes during coro_state_free->destroy here.
2821
2822 $RELOAD_WATCHER ||= Event->timer (
2823 reentrant => 0,
2824 after => 0,
2825 data => WF_AUTOCANCEL,
2826 cb => sub {
2827 do_reload_perl;
2828 undef $RELOAD_WATCHER;
2829 },
2830 );
2831}
2832
2418register_command "reload" => sub { 2833register_command "reload" => sub {
2419 my ($who, $arg) = @_; 2834 my ($who, $arg) = @_;
2420 2835
2421 if ($who->flag (FLAG_WIZ)) { 2836 if ($who->flag (FLAG_WIZ)) {
2422 $who->message ("reloading server."); 2837 $who->message ("reloading server.");
2423 2838 async { reload_perl };
2424 # doing reload synchronously and two reloads happen back-to-back,
2425 # coro crashes during coro_state_free->destroy here.
2426
2427 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub {
2428 reload;
2429 undef $RELOAD_WATCHER;
2430 });
2431 } 2839 }
2432}; 2840};
2433 2841
2434unshift @INC, $LIBDIR; 2842unshift @INC, $LIBDIR;
2435 2843
2436my $bug_warning = 0; 2844my $bug_warning = 0;
2437 2845
2846our @WAIT_FOR_TICK;
2847our @WAIT_FOR_TICK_BEGIN;
2848
2849sub wait_for_tick {
2850 return unless $TICK_WATCHER->is_active;
2851 return if $Coro::current == $Coro::main;
2852
2853 my $signal = new Coro::Signal;
2854 push @WAIT_FOR_TICK, $signal;
2855 $signal->wait;
2856}
2857
2858sub wait_for_tick_begin {
2859 return unless $TICK_WATCHER->is_active;
2860 return if $Coro::current == $Coro::main;
2861
2862 my $signal = new Coro::Signal;
2863 push @WAIT_FOR_TICK_BEGIN, $signal;
2864 $signal->wait;
2865}
2866
2867 my $min = 1e6;#d#
2868 my $avg = 10;
2438$TICK_WATCHER = Event->timer ( 2869$TICK_WATCHER = Event->timer (
2439 reentrant => 0, 2870 reentrant => 0,
2440 parked => 1, 2871 parked => 1,
2441 prio => 0, 2872 prio => 0,
2442 at => $NEXT_TICK || $TICK, 2873 at => $NEXT_TICK || $TICK,
2446 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 2877 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2447 unless ++$bug_warning > 10; 2878 unless ++$bug_warning > 10;
2448 return; 2879 return;
2449 } 2880 }
2450 2881
2451 $NOW = Event::time; 2882 $NOW = $tick_start = Event::time;
2452 2883
2453 cf::server_tick; # one server iteration 2884 cf::server_tick; # one server iteration
2885
2886 0 && sync_job {#d#
2887 for(1..10) {
2888 my $t = Event::time;
2889 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2890 or die;
2891
2892 $map->width (50);
2893 $map->height (50);
2894 $map->alloc;
2895 $map->_load_objects ("/tmp/x.map", 1);
2896 my $t = Event::time - $t;
2897
2898 #next unless $t < 0.0013;#d#
2899 if ($t < $min) {
2900 $min = $t;
2901 }
2902 $avg = $avg * 0.99 + $t * 0.01;
2903 }
2904 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2905 exit 0;
2906 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2907 };
2908
2454 $RUNTIME += $TICK; 2909 $RUNTIME += $TICK;
2455 $NEXT_TICK += $TICK; 2910 $NEXT_TICK += $TICK;
2456 2911
2457 $WAIT_FOR_TICK->broadcast; 2912 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2458 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2913 $NEXT_RUNTIME_WRITE = $NOW + 10;
2914 Coro::async_pool {
2915 write_runtime
2916 or warn "ERROR: unable to write runtime file: $!";
2917 };
2918 }
2919
2920# my $AFTER = Event::time;
2921# warn $AFTER - $NOW;#d#
2922
2923 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2924 $sig->send;
2925 }
2926 while (my $sig = shift @WAIT_FOR_TICK) {
2927 $sig->send;
2928 }
2929
2930 $NOW = Event::time;
2459 2931
2460 # if we are delayed by four ticks or more, skip them all 2932 # if we are delayed by four ticks or more, skip them all
2461 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2933 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2462 2934
2463 $TICK_WATCHER->at ($NEXT_TICK); 2935 $TICK_WATCHER->at ($NEXT_TICK);
2464 $TICK_WATCHER->start; 2936 $TICK_WATCHER->start;
2937
2938 $LOAD = ($NOW - $tick_start) / $TICK;
2939 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2940
2941 _post_tick;
2942
2943
2465 }, 2944 },
2466); 2945);
2467 2946
2947{
2948 BDB::max_poll_time $TICK * 0.1;
2949 $BDB_POLL_WATCHER = Event->io (
2950 reentrant => 0,
2951 fd => BDB::poll_fileno,
2952 poll => 'r',
2953 prio => 0,
2954 data => WF_AUTOCANCEL,
2955 cb => \&BDB::poll_cb,
2956 );
2957 BDB::min_parallel 8;
2958
2959 BDB::set_sync_prepare {
2960 my $status;
2961 my $current = $Coro::current;
2962 (
2963 sub {
2964 $status = $!;
2965 $current->ready; undef $current;
2966 },
2967 sub {
2968 Coro::schedule while defined $current;
2969 $! = $status;
2970 },
2971 )
2972 };
2973
2974 unless ($DB_ENV) {
2975 $DB_ENV = BDB::db_env_create;
2976
2977 cf::sync_job {
2978 eval {
2979 BDB::db_env_open
2980 $DB_ENV,
2981 $BDBDIR,
2982 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2983 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2984 0666;
2985
2986 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2987
2988 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2989 $DB_ENV->set_lk_detect;
2990 };
2991
2992 cf::cleanup "db_env_open(db): $@" if $@;
2993 };
2994 }
2995}
2996
2997{
2998 IO::AIO::min_parallel 8;
2999
3000 undef $Coro::AIO::WATCHER;
2468IO::AIO::max_poll_time $TICK * 0.2; 3001 IO::AIO::max_poll_time $TICK * 0.1;
2469
2470$AIO_POLL_WATCHER = Event->io ( 3002 $AIO_POLL_WATCHER = Event->io (
2471 fd => IO::AIO::poll_fileno, 3003 reentrant => 0,
2472 poll => 'r',
2473 prio => 5,
2474 data => WF_AUTOCANCEL,
2475 cb => \&IO::AIO::poll_cb,
2476);
2477
2478$WRITE_RUNTIME_WATCHER = Event->timer (
2479 data => WF_AUTOCANCEL, 3004 data => WF_AUTOCANCEL,
2480 after => 1, 3005 fd => IO::AIO::poll_fileno,
2481 interval => 10, 3006 poll => 'r',
2482 cb => Coro::unblock_sub { 3007 prio => 6,
2483 write_runtime 3008 cb => \&IO::AIO::poll_cb,
2484 or warn "ERROR: unable to write runtime file: $!"; 3009 );
3010}
3011
3012my $_log_backtrace;
3013
3014sub _log_backtrace {
3015 my ($msg, @addr) = @_;
3016
3017 $msg =~ s/\n//;
3018
3019 # limit the # of concurrent backtraces
3020 if ($_log_backtrace < 2) {
3021 ++$_log_backtrace;
3022 async {
3023 my @bt = fork_call {
3024 @addr = map { sprintf "%x", $_ } @addr;
3025 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3026 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3027 or die "addr2line: $!";
3028
3029 my @funcs;
3030 my @res = <$fh>;
3031 chomp for @res;
3032 while (@res) {
3033 my ($func, $line) = splice @res, 0, 2, ();
3034 push @funcs, "[$func] $line";
3035 }
3036
3037 @funcs
3038 };
3039
3040 LOG llevInfo, "[ABT] $msg\n";
3041 LOG llevInfo, "[ABT] $_\n" for @bt;
3042 --$_log_backtrace;
3043 };
3044 } else {
3045 LOG llevInfo, "[ABT] $msg\n";
3046 LOG llevInfo, "[ABT] [suppressed]\n";
2485 }, 3047 }
2486); 3048}
3049
3050# load additional modules
3051use cf::pod;
2487 3052
2488END { cf::emergency_save } 3053END { cf::emergency_save }
2489 3054
24901 30551
2491 3056

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines