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.175 by root, Sun Jan 14 21:20:51 2007 UTC vs.
Revision 1.274 by root, Tue Jun 5 13:05:02 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
957 1030
958sub exists($) { 1031sub exists($) {
959 my ($login) = @_; 1032 my ($login) = @_;
960 1033
961 $cf::PLAYER{$login} 1034 $cf::PLAYER{$login}
962 or cf::sync_job { !aio_stat $login } 1035 or cf::sync_job { !aio_stat path $login }
963} 1036}
964 1037
965sub find($) { 1038sub find($) {
966 return $cf::PLAYER{$_[0]} || do { 1039 return $cf::PLAYER{$_[0]} || do {
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
1121our $MAX_RESET = 3600; 1262our $MAX_RESET = 3600;
1122our $DEFAULT_RESET = 3000; 1263our $DEFAULT_RESET = 3000;
1123 1264
1124sub generate_random_map { 1265sub generate_random_map {
1125 my ($self, $rmp) = @_; 1266 my ($self, $rmp) = @_;
1126
1127 # mit "rum" bekleckern, nicht 1267 # mit "rum" bekleckern, nicht
1128 $self->_create_random_map ( 1268 $self->_create_random_map (
1129 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1269 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1130 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1270 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1131 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1271 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1138 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1278 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1139 (cf::region::find $rmp->{region}), $rmp->{custom} 1279 (cf::region::find $rmp->{region}), $rmp->{custom}
1140 ) 1280 )
1141} 1281}
1142 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
1143sub register { 1291sub register {
1144 my (undef, $regex) = @_; 1292 my (undef, $regex, $prio) = @_;
1145 my $pkg = caller; 1293 my $pkg = caller;
1146 1294
1147 no strict; 1295 no strict;
1148 push @{"$pkg\::ISA"}, __PACKAGE__; 1296 push @{"$pkg\::ISA"}, __PACKAGE__;
1149 1297
1150 $EXT_MAP{$pkg} = qr<$regex>; 1298 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1151} 1299}
1152 1300
1153# also paths starting with '/' 1301# also paths starting with '/'
1154$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1302$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1155 1303
1156sub thawer_merge { 1304sub thawer_merge {
1157 my ($self, $merge) = @_; 1305 my ($self, $merge) = @_;
1158 1306
1159 # we have to keep some variables in memory intact 1307 # we have to keep some variables in memory intact
1165 $self->SUPER::thawer_merge ($merge); 1313 $self->SUPER::thawer_merge ($merge);
1166} 1314}
1167 1315
1168sub normalise { 1316sub normalise {
1169 my ($path, $base) = @_; 1317 my ($path, $base) = @_;
1318
1319 $path = "$path"; # make sure its a string
1320
1321 $path =~ s/\.map$//;
1170 1322
1171 # map plan: 1323 # map plan:
1172 # 1324 #
1173 # /! non-realised random map exit (special hack!) 1325 # /! non-realised random map exit (special hack!)
1174 # {... are special paths that are not being touched 1326 # {... are special paths that are not being touched
1202 1354
1203 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1355 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1204 1356
1205 $path = normalise $path, $base; 1357 $path = normalise $path, $base;
1206 1358
1207 for my $pkg (keys %EXT_MAP) { 1359 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1208 if ($path =~ $EXT_MAP{$pkg}) { 1360 if ($path =~ $EXT_MAP{$pkg}[1]) {
1209 my $self = bless cf::map::new, $pkg; 1361 my $self = bless cf::map::new, $pkg;
1210 $self->{path} = $path; $self->path ($path); 1362 $self->{path} = $path; $self->path ($path);
1211 $self->init; # pass $1 etc. 1363 $self->init; # pass $1 etc.
1212 return $self; 1364 return $self;
1213 } 1365 }
1214 } 1366 }
1215 1367
1216 Carp::carp "unable to resolve path '$path'."; 1368 Carp::carp "unable to resolve path '$path' (base '$base').";
1217 () 1369 ()
1218} 1370}
1219 1371
1220sub init { 1372sub init {
1221 my ($self) = @_; 1373 my ($self) = @_;
1236 1388
1237# the original (read-only) location 1389# the original (read-only) location
1238sub load_path { 1390sub load_path {
1239 my ($self) = @_; 1391 my ($self) = @_;
1240 1392
1241 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1393 "$MAPDIR/$self->{path}.map"
1242} 1394}
1243 1395
1244# the temporary/swap location 1396# the temporary/swap location
1245sub save_path { 1397sub save_path {
1246 my ($self) = @_; 1398 my ($self) = @_;
1247 1399
1248 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1400 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1249 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1401 "$TMPDIR/$path.map"
1250} 1402}
1251 1403
1252# the unique path, undef == no special unique path 1404# the unique path, undef == no special unique path
1253sub uniq_path { 1405sub uniq_path {
1254 my ($self) = @_; 1406 my ($self) = @_;
1255 1407
1256 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1408 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1257 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1409 "$UNIQUEDIR/$path"
1258} 1410}
1259 1411
1260# and all this just because we cannot iterate over 1412# and all this just because we cannot iterate over
1261# all maps in C++... 1413# all maps in C++...
1262sub change_all_map_light { 1414sub change_all_map_light {
1276 1428
1277sub load_header_from($) { 1429sub load_header_from($) {
1278 my ($self, $path) = @_; 1430 my ($self, $path) = @_;
1279 1431
1280 utf8::encode $path; 1432 utf8::encode $path;
1281 aio_open $path, O_RDONLY, 0 1433 #aio_open $path, O_RDONLY, 0
1282 or return; 1434 # or return;
1283 1435
1284 $self->_load_header ($path) 1436 $self->_load_header ($path)
1285 or return; 1437 or return;
1286 1438
1287 $self->{load_path} = $path; 1439 $self->{load_path} = $path;
1288 1440
1289 1 1441 1
1290} 1442}
1291 1443
1292sub load_orig { 1444sub load_header_orig {
1293 my ($self) = @_; 1445 my ($self) = @_;
1294 1446
1295 $self->load_header_from ($self->load_path) 1447 $self->load_header_from ($self->load_path)
1296} 1448}
1297 1449
1298sub load_temp { 1450sub load_header_temp {
1299 my ($self) = @_; 1451 my ($self) = @_;
1300 1452
1301 $self->load_header_from ($self->save_path) 1453 $self->load_header_from ($self->save_path)
1454}
1455
1456sub prepare_temp {
1457 my ($self) = @_;
1458
1459 $self->last_access ((delete $self->{last_access})
1460 || $cf::RUNTIME); #d#
1461 # safety
1462 $self->{instantiate_time} = $cf::RUNTIME
1463 if $self->{instantiate_time} > $cf::RUNTIME;
1464}
1465
1466sub prepare_orig {
1467 my ($self) = @_;
1468
1469 $self->{load_original} = 1;
1470 $self->{instantiate_time} = $cf::RUNTIME;
1471 $self->last_access ($cf::RUNTIME);
1472 $self->instantiate;
1302} 1473}
1303 1474
1304sub load_header { 1475sub load_header {
1305 my ($self) = @_; 1476 my ($self) = @_;
1306 1477
1307 if ($self->load_temp) { 1478 if ($self->load_header_temp) {
1308 $self->last_access ((delete $self->{last_access}) 1479 $self->prepare_temp;
1309 || $cf::RUNTIME); #d#
1310 # safety
1311 $self->{instantiate_time} = $cf::RUNTIME
1312 if $self->{instantiate_time} > $cf::RUNTIME;
1313 } else { 1480 } else {
1314 $self->load_orig 1481 $self->load_header_orig
1315 or return; 1482 or return;
1316 1483 $self->prepare_orig;
1317 $self->{load_original} = 1;
1318 $self->{instantiate_time} = $cf::RUNTIME;
1319 $self->last_access ($cf::RUNTIME);
1320 $self->instantiate;
1321 } 1484 }
1485
1486 $self->default_region (cf::region::find_by_path $self->{path})
1487 unless $self->default_region;
1322 1488
1323 1 1489 1
1324} 1490}
1325 1491
1326sub find; 1492sub find;
1339 $map->{last_save} = $cf::RUNTIME; 1505 $map->{last_save} = $cf::RUNTIME;
1340 1506
1341 $map->load_header 1507 $map->load_header
1342 or return; 1508 or return;
1343 1509
1344 if ($map->should_reset) { 1510 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1511 # doing this can freeze the server in a sync job, obviously
1345 $cf::WAIT_FOR_TICK->wait; 1512 #$cf::WAIT_FOR_TICK->wait;
1346 $map->reset; 1513 $map->reset;
1347 undef $guard; 1514 undef $guard;
1348 $map = find $path 1515 return find $path;
1349 or return;
1350 } 1516 }
1351 1517
1352 $cf::MAP{$path} = $map 1518 $cf::MAP{$path} = $map
1353 } 1519 }
1354} 1520}
1521
1522sub pre_load { }
1523sub post_load { }
1355 1524
1356sub load { 1525sub load {
1357 my ($self) = @_; 1526 my ($self) = @_;
1358 1527
1528 local $self->{deny_reset} = 1; # loading can take a long time
1529
1359 my $path = $self->{path}; 1530 my $path = $self->{path};
1531
1532 {
1360 my $guard = cf::lock_acquire "map_load:$path"; 1533 my $guard = cf::lock_acquire "map_load:$path";
1361 1534
1362 return if $self->in_memory != cf::MAP_SWAPPED; 1535 return if $self->in_memory != cf::MAP_SWAPPED;
1363 1536
1364 $self->in_memory (cf::MAP_LOADING); 1537 $self->in_memory (cf::MAP_LOADING);
1365 1538
1366 $self->alloc; 1539 $self->alloc;
1367 $self->_load_objects ($self->{load_path}, 1)
1368 or return;
1369 1540
1370 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1541 $self->pre_load;
1371 if delete $self->{load_original};
1372
1373 if (my $uniq = $self->uniq_path) {
1374 utf8::encode $uniq;
1375 if (aio_open $uniq, O_RDONLY, 0) {
1376 $self->clear_unique_items;
1377 $self->_load_objects ($uniq, 0);
1378 }
1379 }
1380
1381 Coro::cede;
1382
1383 # now do the right thing for maps
1384 $self->link_multipart_objects;
1385
1386 unless ($self->{deny_activate}) {
1387 $self->decay_objects;
1388 $self->fix_auto_apply;
1389 $self->update_buttons;
1390 Coro::cede; 1542 Coro::cede;
1391 $self->set_darkness_map; 1543
1544 $self->_load_objects ($self->{load_path}, 1)
1545 or return;
1546
1547 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1548 if delete $self->{load_original};
1549
1550 if (my $uniq = $self->uniq_path) {
1551 utf8::encode $uniq;
1552 if (aio_open $uniq, O_RDONLY, 0) {
1553 $self->clear_unique_items;
1554 $self->_load_objects ($uniq, 0);
1555 }
1556 }
1557
1558 Coro::cede;
1559 # now do the right thing for maps
1560 $self->link_multipart_objects;
1392 $self->difficulty ($self->estimate_difficulty) 1561 $self->difficulty ($self->estimate_difficulty)
1393 unless $self->difficulty; 1562 unless $self->difficulty;
1394 Coro::cede; 1563 Coro::cede;
1564
1565 unless ($self->{deny_activate}) {
1566 $self->decay_objects;
1567 $self->fix_auto_apply;
1568 $self->update_buttons;
1569 Coro::cede;
1570 $self->set_darkness_map;
1571 Coro::cede;
1395 $self->activate; 1572 $self->activate;
1396 } 1573 }
1397 1574
1398 $self->in_memory (cf::MAP_IN_MEMORY); 1575 $self->in_memory (cf::MAP_IN_MEMORY);
1576 }
1577
1578 $self->post_load;
1399} 1579}
1400 1580
1401sub customise_for { 1581sub customise_for {
1402 my ($self, $ob) = @_; 1582 my ($self, $ob) = @_;
1403 1583
1442 1622
1443 cf::sync_job { $map->load }; 1623 cf::sync_job { $map->load };
1444} 1624}
1445 1625
1446our %MAP_PREFETCH; 1626our %MAP_PREFETCH;
1447our $MAP_PREFETCHER = Coro::async { 1627our $MAP_PREFETCHER = undef;
1448 while () {
1449 for my $path (keys %MAP_PREFETCH) {
1450 my $map = find $path
1451 or next;
1452 $map->load;
1453
1454 delete $MAP_PREFETCH{$path};
1455 }
1456 Coro::schedule;
1457 }
1458};
1459 1628
1460sub find_async { 1629sub find_async {
1461 my ($path, $origin) = @_; 1630 my ($path, $origin) = @_;
1462 1631
1463 $path = normalise $path, $origin && $origin->{path}; 1632 $path = normalise $path, $origin && $origin->{path};
1464 1633
1465 if (my $map = $cf::MAP{$path}) { 1634 if (my $map = $cf::MAP{$path}) {
1466 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1635 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1467 } 1636 }
1468 1637
1469 $MAP_PREFETCH{$path} = 0; 1638 undef $MAP_PREFETCH{$path};
1639 $MAP_PREFETCHER ||= cf::async {
1640 while (%MAP_PREFETCH) {
1641 for my $path (keys %MAP_PREFETCH) {
1642 my $map = find $path
1643 or next;
1644 $map->load;
1645
1646 delete $MAP_PREFETCH{$path};
1647 }
1648 }
1649 undef $MAP_PREFETCHER;
1650 };
1470 $MAP_PREFETCHER->ready; 1651 $MAP_PREFETCHER->prio (6);
1471 1652
1472 () 1653 ()
1473} 1654}
1474 1655
1475sub save { 1656sub save {
1543 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1724 my $lock = cf::lock_acquire "map_data:$self->{path}";
1544 1725
1545 return if $self->players; 1726 return if $self->players;
1546 return if $self->isa ("ext::map_per_player");#d# 1727 return if $self->isa ("ext::map_per_player");#d#
1547 1728
1548 warn "resetting map ", $self->path;#d# 1729 warn "resetting map ", $self->path;
1730
1731 $self->in_memory (cf::MAP_SWAPPED);
1732
1733 # need to save uniques path
1734 unless ($self->{deny_save}) {
1735 my $uniq = $self->uniq_path; utf8::encode $uniq;
1736
1737 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1738 if $uniq;
1739 }
1549 1740
1550 delete $cf::MAP{$self->path}; 1741 delete $cf::MAP{$self->path};
1551 1742
1552 $self->in_memory (cf::MAP_SWAPPED);
1553 $self->clear; 1743 $self->clear;
1554 1744
1555 $_->clear_links_to ($self) for values %cf::MAP; 1745 $_->clear_links_to ($self) for values %cf::MAP;
1556 1746
1557 $self->unlink_save; 1747 $self->unlink_save;
1584instantiated unique items. May block. 1774instantiated unique items. May block.
1585 1775
1586=cut 1776=cut
1587 1777
1588sub unique_maps() { 1778sub unique_maps() {
1589 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 1779 my $files = aio_readdir $UNIQUEDIR
1590 or return; 1780 or return;
1591 1781
1592 my @paths; 1782 my @paths;
1593 1783
1594 for (@$files) { 1784 for (@$files) {
1595 utf8::decode $_; 1785 utf8::decode $_;
1596 next if /\.pst$/; 1786 next if /\.pst$/;
1597 next unless /^$PATH_SEP/o; 1787 next unless /^$PATH_SEP/o;
1598 1788
1599 s/\.map$//; 1789 push @paths, cf::map::normalise $_;
1600 push @paths, $_;
1601 } 1790 }
1602 1791
1603 \@paths 1792 \@paths
1604} 1793}
1605 1794
1699=cut 1888=cut
1700 1889
1701sub link_map { 1890sub link_map {
1702 unless ($LINK_MAP) { 1891 unless ($LINK_MAP) {
1703 $LINK_MAP = cf::map::find "{link}" 1892 $LINK_MAP = cf::map::find "{link}"
1704 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1893 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1705 $LINK_MAP->load; 1894 $LINK_MAP->load;
1706 } 1895 }
1707 1896
1708 $LINK_MAP 1897 $LINK_MAP
1709} 1898}
1714 $self->deactivate_recursive; 1903 $self->deactivate_recursive;
1715 1904
1716 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1905 return if UNIVERSAL::isa $self->map, "ext::map_link";
1717 1906
1718 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1907 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1719 if $self->map; 1908 if $self->map && $self->map->{path} ne "{link}";
1720 1909
1721 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1910 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1722} 1911}
1723 1912
1724sub cf::object::player::leave_link { 1913sub cf::object::player::leave_link {
1725 my ($self, $map, $x, $y) = @_; 1914 my ($self, $map, $x, $y) = @_;
1915
1916 return unless $self->contr->active;
1726 1917
1727 my $link_pos = delete $self->{_link_pos}; 1918 my $link_pos = delete $self->{_link_pos};
1728 1919
1729 unless ($map) { 1920 unless ($map) {
1730 # restore original map position 1921 # restore original map position
1748 $map->load; 1939 $map->load;
1749 $map->load_diag; 1940 $map->load_diag;
1750 1941
1751 return unless $self->contr->active; 1942 return unless $self->contr->active;
1752 $self->activate_recursive; 1943 $self->activate_recursive;
1944
1945 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1753 $self->enter_map ($map, $x, $y); 1946 $self->enter_map ($map, $x, $y);
1754} 1947}
1755 1948
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) 1949=item $player_object->goto ($path, $x, $y[, $check->($map)])
1789 1950
1951Moves the player to the given map-path and coordinates by first freezing
1952her, loading and preparing them map, calling the provided $check callback
1953that has to return the map if sucecssful, and then unfreezes the player on
1954the new (success) or old (failed) map position.
1955
1790=cut 1956=cut
1957
1958our $GOTOGEN;
1791 1959
1792sub cf::object::player::goto { 1960sub cf::object::player::goto {
1793 my ($self, $path, $x, $y) = @_; 1961 my ($self, $path, $x, $y, $check) = @_;
1962
1963 # do generation counting so two concurrent goto's will be executed in-order
1964 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1794 1965
1795 $self->enter_link; 1966 $self->enter_link;
1796 1967
1797 (async { 1968 (async {
1969 my $map = eval {
1798 my $map = cf::map::find $path; 1970 my $map = cf::map::find $path;
1971
1972 if ($map) {
1799 $map = $map->customise_for ($self) if $map; 1973 $map = $map->customise_for ($self);
1800 1974 $map = $check->($map) if $check && $map;
1801# warn "entering ", $map->path, " at ($x, $y)\n" 1975 } else {
1802# if $map;
1803
1804 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1976 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1977 }
1805 1978
1979 $map
1980 };
1981
1982 if ($@) {
1983 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
1984 LOG llevError | logBacktrace, Carp::longmess $@;
1985 }
1986
1987 if ($gen == $self->{_goto_generation}) {
1988 delete $self->{_goto_generation};
1806 $self->leave_link ($map, $x, $y); 1989 $self->leave_link ($map, $x, $y);
1990 }
1807 })->prio (1); 1991 })->prio (1);
1808} 1992}
1809 1993
1810=item $player_object->enter_exit ($exit_object) 1994=item $player_object->enter_exit ($exit_object)
1811 1995
1813 1997
1814sub parse_random_map_params { 1998sub parse_random_map_params {
1815 my ($spec) = @_; 1999 my ($spec) = @_;
1816 2000
1817 my $rmp = { # defaults 2001 my $rmp = { # defaults
1818 xsize => 10, 2002 xsize => (cf::rndm 15, 40),
1819 ysize => 10, 2003 ysize => (cf::rndm 15, 40),
2004 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
2005 #layout => string,
1820 }; 2006 };
1821 2007
1822 for (split /\n/, $spec) { 2008 for (split /\n/, $spec) {
1823 my ($k, $v) = split /\s+/, $_, 2; 2009 my ($k, $v) = split /\s+/, $_, 2;
1824 2010
1828 $rmp 2014 $rmp
1829} 2015}
1830 2016
1831sub prepare_random_map { 2017sub prepare_random_map {
1832 my ($exit) = @_; 2018 my ($exit) = @_;
2019
2020 my $guard = cf::lock_acquire "exit_prepare:$exit";
1833 2021
1834 # all this does is basically replace the /! path by 2022 # all this does is basically replace the /! path by
1835 # a new random map path (?random/...) with a seed 2023 # a new random map path (?random/...) with a seed
1836 # that depends on the exit object 2024 # that depends on the exit object
1837 2025
1838 my $rmp = parse_random_map_params $exit->msg; 2026 my $rmp = parse_random_map_params $exit->msg;
1839 2027
1840 if ($exit->map) { 2028 if ($exit->map) {
1841 $rmp->{region} = $exit->map->region_name; 2029 $rmp->{region} = $exit->region->name;
1842 $rmp->{origin_map} = $exit->map->path; 2030 $rmp->{origin_map} = $exit->map->path;
1843 $rmp->{origin_x} = $exit->x; 2031 $rmp->{origin_x} = $exit->x;
1844 $rmp->{origin_y} = $exit->y; 2032 $rmp->{origin_y} = $exit->y;
1845 } 2033 }
1846 2034
1847 $rmp->{random_seed} ||= $exit->random_seed; 2035 $rmp->{random_seed} ||= $exit->random_seed;
1848 2036
1849 my $data = cf::to_json $rmp; 2037 my $data = cf::to_json $rmp;
1850 my $md5 = Digest::MD5::md5_hex $data; 2038 my $md5 = Digest::MD5::md5_hex $data;
2039 my $meta = "$RANDOMDIR/$md5.meta";
1851 2040
1852 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 2041 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1853 aio_write $fh, 0, (length $data), $data, 0; 2042 aio_write $fh, 0, (length $data), $data, 0;
2043 undef $fh;
2044 aio_rename "$meta~", $meta;
1854 2045
1855 $exit->slaying ("?random/$md5"); 2046 $exit->slaying ("?random/$md5");
1856 $exit->msg (undef); 2047 $exit->msg (undef);
1857 } 2048 }
1858} 2049}
1859 2050
1860sub cf::object::player::enter_exit { 2051sub cf::object::player::enter_exit {
1861 my ($self, $exit) = @_; 2052 my ($self, $exit) = @_;
1862 2053
1863 return unless $self->type == cf::PLAYER; 2054 return unless $self->type == cf::PLAYER;
2055
2056 if ($exit->slaying eq "/!") {
2057 #TODO: this should de-fi-ni-te-ly not be a sync-job
2058 # the problem is that $exit might not survive long enough
2059 # so it needs to be done right now, right here
2060 cf::sync_job { prepare_random_map $exit };
2061 }
2062
2063 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2064 my $hp = $exit->stats->hp;
2065 my $sp = $exit->stats->sp;
1864 2066
1865 $self->enter_link; 2067 $self->enter_link;
1866 2068
1867 (async { 2069 (async {
1868 $self->deactivate_recursive; # just to be sure 2070 $self->deactivate_recursive; # just to be sure
1869 unless (eval { 2071 unless (eval {
1870 prepare_random_map $exit 2072 $self->goto ($slaying, $hp, $sp);
1871 if $exit->slaying eq "/!";
1872
1873 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1874 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1875 2073
1876 1; 2074 1;
1877 }) { 2075 }) {
1878 $self->message ("Something went wrong deep within the crossfire server. " 2076 $self->message ("Something went wrong deep within the crossfire server. "
1879 . "I'll try to bring you back to the map you were before. " 2077 . "I'll try to bring you back to the map you were before. "
1880 . "Please report this to the dungeon master!", 2078 . "Please report this to the dungeon master!",
1881 cf::NDI_UNIQUE | cf::NDI_RED); 2079 cf::NDI_UNIQUE | cf::NDI_RED);
1882 2080
1883 warn "ERROR in enter_exit: $@"; 2081 warn "ERROR in enter_exit: $@";
1884 $self->leave_link; 2082 $self->leave_link;
1885 } 2083 }
1886 })->prio (1); 2084 })->prio (1);
1899 2097
1900sub cf::client::send_drawinfo { 2098sub cf::client::send_drawinfo {
1901 my ($self, $text, $flags) = @_; 2099 my ($self, $text, $flags) = @_;
1902 2100
1903 utf8::encode $text; 2101 utf8::encode $text;
1904 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2102 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1905} 2103}
1906 2104
2105=item $client->ext_event ($type, %msg)
2106
2107Sends an exti event to the client.
2108
2109=cut
2110
2111sub cf::client::ext_event($$%) {
2112 my ($self, $type, %msg) = @_;
2113
2114 $msg{msgtype} = "event_$type";
2115 $self->send_packet ("ext " . cf::to_json \%msg);
2116}
1907 2117
1908=item $success = $client->query ($flags, "text", \&cb) 2118=item $success = $client->query ($flags, "text", \&cb)
1909 2119
1910Queues a query to the client, calling the given callback with 2120Queues a query to the client, calling the given callback with
1911the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2121the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
1940 # get handled first 2150 # get handled first
1941 my $queue = delete $ns->{query_queue} 2151 my $queue = delete $ns->{query_queue}
1942 or return; # be conservative, not sure how that can happen, but we saw a crash here 2152 or return; # be conservative, not sure how that can happen, but we saw a crash here
1943 2153
1944 (shift @$queue)->[1]->($msg); 2154 (shift @$queue)->[1]->($msg);
2155 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1945 2156
1946 push @{ $ns->{query_queue} }, @$queue; 2157 push @{ $ns->{query_queue} }, @$queue;
1947 2158
1948 if (@{ $ns->{query_queue} } == @$queue) { 2159 if (@{ $ns->{query_queue} } == @$queue) {
1949 if (@$queue) { 2160 if (@$queue) {
2007 2218
2008# here we export the classes and methods available to script code 2219# here we export the classes and methods available to script code
2009 2220
2010=pod 2221=pod
2011 2222
2012The following fucntions and emthods are available within a safe environment: 2223The following functions and methods are available within a safe environment:
2013 2224
2014 cf::object contr pay_amount pay_player map 2225 cf::object contr pay_amount pay_player map
2015 cf::object::player player 2226 cf::object::player player
2016 cf::player peaceful 2227 cf::player peaceful
2017 cf::map trigger 2228 cf::map trigger
2102############################################################################# 2313#############################################################################
2103 2314
2104=head2 EXTENSION DATABASE SUPPORT 2315=head2 EXTENSION DATABASE SUPPORT
2105 2316
2106Crossfire maintains a very simple database for extension use. It can 2317Crossfire maintains a very simple database for extension use. It can
2107currently store anything that can be serialised using Storable, which 2318currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2108excludes objects. 2319convert to/from binary).
2109 2320
2110The parameter C<$family> should best start with the name of the extension 2321The parameter C<$family> should best start with the name of the extension
2111using it, it should be unique. 2322using it, it should be unique.
2112 2323
2113=over 4 2324=over 4
2114 2325
2115=item $hashref = cf::db_get $family
2116
2117Return a hashref for use by the extension C<$family>, which can be
2118modified. After modifications, you have to call C<cf::db_dirty> or
2119C<cf::db_sync>.
2120
2121=item $value = cf::db_get $family => $key 2326=item $value = cf::db_get $family => $key
2122 2327
2123Returns a single value from the database 2328Returns a single value from the database.
2124
2125=item cf::db_put $family => $hashref
2126
2127Stores the given family hashref into the database. Updates are delayed, if
2128you want the data to be synced to disk immediately, use C<cf::db_sync>.
2129 2329
2130=item cf::db_put $family => $key => $value 2330=item cf::db_put $family => $key => $value
2131 2331
2132Stores the given C<$value> in the family hash. Updates are delayed, if you 2332Stores the given C<$value> in the family.
2133want the data to be synced to disk immediately, use C<cf::db_sync>.
2134
2135=item cf::db_dirty
2136
2137Marks the database as dirty, to be updated at a later time.
2138
2139=item cf::db_sync
2140
2141Immediately write the database to disk I<if it is dirty>.
2142 2333
2143=cut 2334=cut
2144 2335
2145our $DB; 2336our $DB;
2146 2337
2147{ 2338sub db_init {
2148 my $path = cf::localdir . "/database.pst"; 2339 unless ($DB) {
2340 $DB = BDB::db_create $DB_ENV;
2149 2341
2150 sub db_load() { 2342 cf::sync_job {
2151 $DB = stat $path ? Storable::retrieve $path : { }; 2343 eval {
2152 } 2344 $DB->set_flags (BDB::CHKSUM);
2153 2345
2154 my $pid; 2346 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2155 2347 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2156 sub db_save() { 2348 cf::cleanup "db_open(db): $!" if $!;
2157 waitpid $pid, 0 if $pid; 2349 };
2158 if (0 == ($pid = fork)) { 2350 cf::cleanup "db_open(db): $@" if $@;
2159 $DB->{_meta}{version} = 1;
2160 Storable::nstore $DB, "$path~";
2161 rename "$path~", $path;
2162 cf::_exit 0 if defined $pid;
2163 } 2351 };
2164 }
2165
2166 my $dirty;
2167
2168 sub db_sync() {
2169 db_save if $dirty;
2170 undef $dirty;
2171 }
2172
2173 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2174 db_sync;
2175 }); 2352 }
2353}
2176 2354
2177 sub db_dirty() {
2178 $dirty = 1;
2179 $idle->start;
2180 }
2181
2182 sub db_get($;$) { 2355sub db_get($$) {
2183 @_ >= 2 2356 my $key = "$_[0]/$_[1]";
2184 ? $DB->{$_[0]}{$_[1]}
2185 : ($DB->{$_[0]} ||= { })
2186 }
2187 2357
2358 cf::sync_job {
2359 BDB::db_get $DB, undef, $key, my $data;
2360
2361 $! ? ()
2362 : $data
2363 }
2364}
2365
2188 sub db_put($$;$) { 2366sub db_put($$$) {
2189 if (@_ >= 3) { 2367 BDB::dbreq_pri 4;
2190 $DB->{$_[0]}{$_[1]} = $_[2]; 2368 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2191 } else { 2369}
2192 $DB->{$_[0]} = $_[1];
2193 }
2194 db_dirty;
2195 }
2196 2370
2197 cf::global->attach ( 2371=item cf::cache $id => [$paths...], $processversion => $process
2198 prio => 10000, 2372
2199 on_cleanup => sub { 2373Generic caching function that returns the value of the resource $id,
2200 db_sync; 2374caching and regenerating as required.
2375
2376This function can block.
2377
2378=cut
2379
2380sub cache {
2381 my ($id, $src, $processversion, $process) = @_;
2382
2383 my $meta =
2384 join "\x00",
2385 $processversion,
2386 map {
2387 aio_stat $_
2388 and Carp::croak "$_: $!";
2389
2390 ($_, (stat _)[7,9])
2391 } @$src;
2392
2393 my $dbmeta = db_get cache => "$id/meta";
2394 if ($dbmeta ne $meta) {
2395 # changed, we may need to process
2396
2397 my @data;
2398 my $md5;
2399
2400 for (0 .. $#$src) {
2401 0 <= aio_load $src->[$_], $data[$_]
2402 or Carp::croak "$src->[$_]: $!";
2201 }, 2403 }
2202 ); 2404
2405 # if processing is expensive, check
2406 # checksum first
2407 if (1) {
2408 $md5 =
2409 join "\x00",
2410 $processversion,
2411 map {
2412 Coro::cede;
2413 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2414 } 0.. $#$src;
2415
2416
2417 my $dbmd5 = db_get cache => "$id/md5";
2418 if ($dbmd5 eq $md5) {
2419 db_put cache => "$id/meta", $meta;
2420
2421 return db_get cache => "$id/data";
2422 }
2423 }
2424
2425 my $t1 = Time::HiRes::time;
2426 my $data = $process->(\@data);
2427 my $t2 = Time::HiRes::time;
2428
2429 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2430
2431 db_put cache => "$id/data", $data;
2432 db_put cache => "$id/md5" , $md5;
2433 db_put cache => "$id/meta", $meta;
2434
2435 return $data;
2436 }
2437
2438 db_get cache => "$id/data"
2439}
2440
2441=item fork_call { }, $args
2442
2443Executes the given code block with the given arguments in a seperate
2444process, returning the results. Everything must be serialisable with
2445Coro::Storable. May, of course, block. Note that the executed sub may
2446never block itself or use any form of Event handling.
2447
2448=cut
2449
2450sub fork_call(&@) {
2451 my ($cb, @args) = @_;
2452
2453# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2454# or die "socketpair: $!";
2455 pipe my $fh1, my $fh2
2456 or die "pipe: $!";
2457
2458 if (my $pid = fork) {
2459 close $fh2;
2460
2461 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2462 $res = Coro::Storable::thaw $res;
2463
2464 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2465
2466 die $$res unless "ARRAY" eq ref $res;
2467
2468 return wantarray ? @$res : $res->[-1];
2469 } else {
2470 reset_signals;
2471 local $SIG{__WARN__};
2472 local $SIG{__DIE__};
2473 eval {
2474 close $fh1;
2475
2476 my @res = eval { $cb->(@args) };
2477 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2478 };
2479
2480 warn $@ if $@;
2481 _exit 0;
2482 }
2203} 2483}
2204 2484
2205############################################################################# 2485#############################################################################
2206# the server's main() 2486# the server's init and main functions
2487
2488sub load_facedata($) {
2489 my ($path) = @_;
2490
2491 warn "loading facedata from $path\n";
2492
2493 my $facedata;
2494 0 < aio_load $path, $facedata
2495 or die "$path: $!";
2496
2497 $facedata = Coro::Storable::thaw $facedata;
2498
2499 $facedata->{version} == 2
2500 or cf::cleanup "$path: version mismatch, cannot proceed.";
2501
2502 {
2503 my $faces = $facedata->{faceinfo};
2504
2505 while (my ($face, $info) = each %$faces) {
2506 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2507 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2508 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2509 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2510 Coro::cede;
2511 }
2512
2513 while (my ($face, $info) = each %$faces) {
2514 next unless $info->{smooth};
2515 my $idx = cf::face::find $face
2516 or next;
2517 if (my $smooth = cf::face::find $info->{smooth}) {
2518 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2519 } else {
2520 warn "smooth face '$info->{smooth}' not found for face '$face'";
2521 }
2522 Coro::cede;
2523 }
2524 }
2525
2526 {
2527 my $anims = $facedata->{animinfo};
2528
2529 while (my ($anim, $info) = each %$anims) {
2530 cf::anim::set $anim, $info->{frames}, $info->{facings};
2531 Coro::cede;
2532 }
2533
2534 cf::anim::invalidate_all; # d'oh
2535 }
2536
2537 1
2538}
2539
2540sub reload_regions {
2541 load_resource_file "$MAPDIR/regions"
2542 or die "unable to load regions file\n";
2543}
2544
2545sub reload_facedata {
2546 load_facedata "$DATADIR/facedata"
2547 or die "unable to load facedata\n";
2548}
2549
2550sub reload_archetypes {
2551 load_resource_file "$DATADIR/archetypes"
2552 or die "unable to load archetypes\n";
2553}
2554
2555sub reload_treasures {
2556 load_resource_file "$DATADIR/treasures"
2557 or die "unable to load treasurelists\n";
2558}
2559
2560sub reload_resources {
2561 warn "reloading resource files...\n";
2562
2563 reload_regions;
2564 reload_facedata;
2565 #reload_archetypes;#d#
2566 reload_archetypes;
2567 reload_treasures;
2568
2569 warn "finished reloading resource files\n";
2570}
2571
2572sub init {
2573 reload_resources;
2574}
2207 2575
2208sub cfg_load { 2576sub cfg_load {
2209 open my $fh, "<:utf8", cf::confdir . "/config" 2577 open my $fh, "<:utf8", "$CONFDIR/config"
2210 or return; 2578 or return;
2211 2579
2212 local $/; 2580 local $/;
2213 *CFG = YAML::Syck::Load <$fh>; 2581 *CFG = YAML::Syck::Load <$fh>;
2214 2582
2229sub main { 2597sub main {
2230 # we must not ever block the main coroutine 2598 # we must not ever block the main coroutine
2231 local $Coro::idle = sub { 2599 local $Coro::idle = sub {
2232 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2600 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2233 (async { 2601 (async {
2234 warn "BP1\n";#d#
2235 Event::one_event; 2602 Event::one_event;
2236 warn "BP2\n";#d#
2237 })->prio (Coro::PRIO_MAX); 2603 })->prio (Coro::PRIO_MAX);
2238 }; 2604 };
2239 2605
2240 cfg_load; 2606 cfg_load;
2241 db_load; 2607 db_init;
2242 load_extensions; 2608 load_extensions;
2609
2610 $TICK_WATCHER->start;
2243 Event::loop; 2611 Event::loop;
2244} 2612}
2245 2613
2246############################################################################# 2614#############################################################################
2247# initialisation and cleanup 2615# initialisation and cleanup
2248 2616
2249# install some emergency cleanup handlers 2617# install some emergency cleanup handlers
2250BEGIN { 2618BEGIN {
2251 for my $signal (qw(INT HUP TERM)) { 2619 for my $signal (qw(INT HUP TERM)) {
2252 Event->signal ( 2620 Event->signal (
2621 reentrant => 0,
2253 data => WF_AUTOCANCEL, 2622 data => WF_AUTOCANCEL,
2254 signal => $signal, 2623 signal => $signal,
2624 prio => 0,
2255 cb => sub { 2625 cb => sub {
2256 cf::cleanup "SIG$signal"; 2626 cf::cleanup "SIG$signal";
2257 }, 2627 },
2258 ); 2628 );
2259 } 2629 }
2260} 2630}
2281 my $map = $cf::MAP{$path} or next; 2651 my $map = $cf::MAP{$path} or next;
2282 $map->valid or next; 2652 $map->valid or next;
2283 $map->save; 2653 $map->save;
2284 } 2654 }
2285 warn "end emergency map save\n"; 2655 warn "end emergency map save\n";
2656
2657 warn "begin emergency database checkpoint\n";
2658 BDB::db_env_txn_checkpoint $DB_ENV;
2659 warn "end emergency database checkpoint\n";
2286 }; 2660 };
2287 2661
2288 warn "leave emergency perl save\n"; 2662 warn "leave emergency perl save\n";
2289} 2663}
2290 2664
2665sub post_cleanup {
2666 my ($make_core) = @_;
2667
2668 warn Carp::longmess "post_cleanup backtrace"
2669 if $make_core;
2670}
2671
2291sub reload() { 2672sub do_reload_perl() {
2292 # can/must only be called in main 2673 # can/must only be called in main
2293 if ($Coro::current != $Coro::main) { 2674 if ($Coro::current != $Coro::main) {
2294 warn "can only reload from main coroutine\n"; 2675 warn "can only reload from main coroutine";
2295 return; 2676 return;
2296 } 2677 }
2297 2678
2298 warn "reloading..."; 2679 warn "reloading...";
2299 2680
2300 warn "freezing server"; 2681 warn "entering sync_job";
2301 my $guard = freeze_mainloop; 2682
2683 cf::sync_job {
2684 cf::write_runtime; # external watchdog should not bark
2302 cf::emergency_save; 2685 cf::emergency_save;
2686 cf::write_runtime; # external watchdog should not bark
2303 2687
2304 warn "sync database to disk"; 2688 warn "syncing database to disk";
2305 cf::db_sync; 2689 BDB::db_env_txn_checkpoint $DB_ENV;
2306 IO::AIO::flush;
2307 2690
2308 eval {
2309 # if anything goes wrong in here, we should simply crash as we already saved 2691 # if anything goes wrong in here, we should simply crash as we already saved
2310 2692
2311 warn "cancel all watchers"; 2693 warn "cancelling all WF_AUTOCANCEL watchers";
2312 for (Event::all_watchers) { 2694 for (Event::all_watchers) {
2313 $_->cancel if $_->data & WF_AUTOCANCEL; 2695 $_->cancel if $_->data & WF_AUTOCANCEL;
2314 } 2696 }
2315 2697
2698 warn "flushing outstanding aio requests";
2699 for (;;) {
2700 BDB::flush;
2701 IO::AIO::flush;
2702 Coro::cede;
2703 last unless IO::AIO::nreqs || BDB::nreqs;
2704 warn "iterate...";
2705 }
2706
2707 ++$RELOAD;
2708
2316 warn "cancel all extension coros"; 2709 warn "cancelling all extension coros";
2317 $_->cancel for values %EXT_CORO; 2710 $_->cancel for values %EXT_CORO;
2318 %EXT_CORO = (); 2711 %EXT_CORO = ();
2319 2712
2320 warn "remove commands"; 2713 warn "removing commands";
2321 %COMMAND = (); 2714 %COMMAND = ();
2322 2715
2323 warn "remove ext commands"; 2716 warn "removing ext commands";
2324 %EXTCMD = (); 2717 %EXTCMD = ();
2325 2718
2326 warn "unload/nuke all extensions"; 2719 warn "unloading/nuking all extensions";
2327 for my $pkg (@EXTS) { 2720 for my $pkg (@EXTS) {
2328 warn "... unloading $pkg"; 2721 warn "... unloading $pkg";
2329 2722
2330 if (my $cb = $pkg->can ("unload")) { 2723 if (my $cb = $pkg->can ("unload")) {
2331 eval { 2724 eval {
2336 2729
2337 warn "... nuking $pkg"; 2730 warn "... nuking $pkg";
2338 Symbol::delete_package $pkg; 2731 Symbol::delete_package $pkg;
2339 } 2732 }
2340 2733
2341 warn "unload all perl modules loaded from $LIBDIR"; 2734 warn "unloading all perl modules loaded from $LIBDIR";
2342 while (my ($k, $v) = each %INC) { 2735 while (my ($k, $v) = each %INC) {
2343 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2736 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2344 2737
2345 warn "removing <$k>"; 2738 warn "... unloading $k";
2346 delete $INC{$k}; 2739 delete $INC{$k};
2347 2740
2348 $k =~ s/\.pm$//; 2741 $k =~ s/\.pm$//;
2349 $k =~ s/\//::/g; 2742 $k =~ s/\//::/g;
2350 2743
2353 } 2746 }
2354 2747
2355 Symbol::delete_package $k; 2748 Symbol::delete_package $k;
2356 } 2749 }
2357 2750
2358 warn "get rid of safe::, as good as possible"; 2751 warn "getting rid of safe::, as good as possible";
2359 Symbol::delete_package "safe::$_" 2752 Symbol::delete_package "safe::$_"
2360 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2753 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2361 2754
2362 warn "unload cf.pm \"a bit\""; 2755 warn "unloading cf.pm \"a bit\"";
2363 delete $INC{"cf.pm"}; 2756 delete $INC{"cf.pm"};
2757 delete $INC{"cf/pod.pm"};
2364 2758
2365 # don't, removes xs symbols, too, 2759 # don't, removes xs symbols, too,
2366 # and global variables created in xs 2760 # and global variables created in xs
2367 #Symbol::delete_package __PACKAGE__; 2761 #Symbol::delete_package __PACKAGE__;
2368 2762
2763 warn "unload completed, starting to reload now";
2764
2369 warn "reloading cf.pm"; 2765 warn "reloading cf.pm";
2370 require cf; 2766 require cf;
2371 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2767 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2372 2768
2373 warn "load config and database again"; 2769 warn "loading config and database again";
2374 cf::cfg_load; 2770 cf::cfg_load;
2375 cf::db_load;
2376 2771
2377 warn "load extensions"; 2772 warn "loading extensions";
2378 cf::load_extensions; 2773 cf::load_extensions;
2379 2774
2380 warn "reattach attachments to objects/players"; 2775 warn "reattaching attachments to objects/players";
2381 _global_reattach; 2776 _global_reattach; # objects, sockets
2382 warn "reattach attachments to maps"; 2777 warn "reattaching attachments to maps";
2383 reattach $_ for values %MAP; 2778 reattach $_ for values %MAP;
2384 }; 2779 warn "reattaching attachments to players";
2780 reattach $_ for values %PLAYER;
2385 2781
2386 if ($@) { 2782 warn "leaving sync_job";
2783
2784 1
2785 } or do {
2387 warn $@; 2786 warn $@;
2388 warn "error while reloading, exiting."; 2787 warn "error while reloading, exiting.";
2389 exit 1; 2788 exit 1;
2390 } 2789 };
2391 2790
2392 warn "reloaded"; 2791 warn "reloaded";
2393}; 2792};
2394 2793
2395our $RELOAD_WATCHER; # used only during reload 2794our $RELOAD_WATCHER; # used only during reload
2396 2795
2796sub reload_perl() {
2797 # doing reload synchronously and two reloads happen back-to-back,
2798 # coro crashes during coro_state_free->destroy here.
2799
2800 $RELOAD_WATCHER ||= Event->timer (
2801 reentrant => 0,
2802 after => 0,
2803 data => WF_AUTOCANCEL,
2804 cb => sub {
2805 do_reload_perl;
2806 undef $RELOAD_WATCHER;
2807 },
2808 );
2809}
2810
2397register_command "reload" => sub { 2811register_command "reload" => sub {
2398 my ($who, $arg) = @_; 2812 my ($who, $arg) = @_;
2399 2813
2400 if ($who->flag (FLAG_WIZ)) { 2814 if ($who->flag (FLAG_WIZ)) {
2401 $who->message ("reloading server."); 2815 $who->message ("reloading server.");
2402 2816 async { reload_perl };
2403 # doing reload synchronously and two reloads happen back-to-back,
2404 # coro crashes during coro_state_free->destroy here.
2405
2406 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub {
2407 reload;
2408 undef $RELOAD_WATCHER;
2409 });
2410 } 2817 }
2411}; 2818};
2412 2819
2413unshift @INC, $LIBDIR; 2820unshift @INC, $LIBDIR;
2414 2821
2822my $bug_warning = 0;
2823
2824our @WAIT_FOR_TICK;
2825our @WAIT_FOR_TICK_BEGIN;
2826
2827sub wait_for_tick {
2828 return unless $TICK_WATCHER->is_active;
2829 return if $Coro::current == $Coro::main;
2830
2831 my $signal = new Coro::Signal;
2832 push @WAIT_FOR_TICK, $signal;
2833 $signal->wait;
2834}
2835
2836sub wait_for_tick_begin {
2837 return unless $TICK_WATCHER->is_active;
2838 return if $Coro::current == $Coro::main;
2839
2840 my $signal = new Coro::Signal;
2841 push @WAIT_FOR_TICK_BEGIN, $signal;
2842 $signal->wait;
2843}
2844
2845 my $min = 1e6;#d#
2846 my $avg = 10;
2415$TICK_WATCHER = Event->timer ( 2847$TICK_WATCHER = Event->timer (
2416 reentrant => 0, 2848 reentrant => 0,
2849 parked => 1,
2417 prio => 0, 2850 prio => 0,
2418 at => $NEXT_TICK || $TICK, 2851 at => $NEXT_TICK || $TICK,
2419 data => WF_AUTOCANCEL, 2852 data => WF_AUTOCANCEL,
2420 cb => sub { 2853 cb => sub {
2854 if ($Coro::current != $Coro::main) {
2855 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2856 unless ++$bug_warning > 10;
2857 return;
2858 }
2859
2421 $NOW = Event::time; 2860 $NOW = $tick_start = Event::time;
2422 2861
2423 cf::server_tick; # one server iteration 2862 cf::server_tick; # one server iteration
2863
2864 0 && sync_job {#d#
2865 for(1..10) {
2866 my $t = Event::time;
2867 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2868 or die;
2869
2870 $map->width (50);
2871 $map->height (50);
2872 $map->alloc;
2873 $map->_load_objects ("/tmp/x.map", 1);
2874 my $t = Event::time - $t;
2875
2876 #next unless $t < 0.0013;#d#
2877 if ($t < $min) {
2878 $min = $t;
2879 }
2880 $avg = $avg * 0.99 + $t * 0.01;
2881 }
2882 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2883 exit 0;
2884 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2885 };
2886
2424 $RUNTIME += $TICK; 2887 $RUNTIME += $TICK;
2425 $NEXT_TICK += $TICK; 2888 $NEXT_TICK += $TICK;
2426 2889
2427 $WAIT_FOR_TICK->broadcast; 2890 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2428 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2891 $NEXT_RUNTIME_WRITE = $NOW + 10;
2892 Coro::async_pool {
2893 write_runtime
2894 or warn "ERROR: unable to write runtime file: $!";
2895 };
2896 }
2897
2898# my $AFTER = Event::time;
2899# warn $AFTER - $NOW;#d#
2900
2901 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2902 $sig->send;
2903 }
2904 while (my $sig = shift @WAIT_FOR_TICK) {
2905 $sig->send;
2906 }
2907
2908 $NOW = Event::time;
2429 2909
2430 # if we are delayed by four ticks or more, skip them all 2910 # if we are delayed by four ticks or more, skip them all
2431 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2911 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2432 2912
2433 $TICK_WATCHER->at ($NEXT_TICK); 2913 $TICK_WATCHER->at ($NEXT_TICK);
2434 $TICK_WATCHER->start; 2914 $TICK_WATCHER->start;
2915
2916 $LOAD = ($NOW - $tick_start) / $TICK;
2917 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2918
2919 _post_tick;
2920
2921
2435 }, 2922 },
2436); 2923);
2437 2924
2925{
2926 BDB::max_poll_time $TICK * 0.1;
2927 $BDB_POLL_WATCHER = Event->io (
2928 reentrant => 0,
2929 fd => BDB::poll_fileno,
2930 poll => 'r',
2931 prio => 0,
2932 data => WF_AUTOCANCEL,
2933 cb => \&BDB::poll_cb,
2934 );
2935 BDB::min_parallel 8;
2936
2937 BDB::set_sync_prepare {
2938 my $status;
2939 my $current = $Coro::current;
2940 (
2941 sub {
2942 $status = $!;
2943 $current->ready; undef $current;
2944 },
2945 sub {
2946 Coro::schedule while defined $current;
2947 $! = $status;
2948 },
2949 )
2950 };
2951
2952 unless ($DB_ENV) {
2953 $DB_ENV = BDB::db_env_create;
2954
2955 cf::sync_job {
2956 eval {
2957 BDB::db_env_open
2958 $DB_ENV,
2959 $BDBDIR,
2960 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2961 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2962 0666;
2963
2964 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2965
2966 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2967 $DB_ENV->set_lk_detect;
2968 };
2969
2970 cf::cleanup "db_env_open(db): $@" if $@;
2971 };
2972 }
2973}
2974
2975{
2976 IO::AIO::min_parallel 8;
2977
2978 undef $Coro::AIO::WATCHER;
2438IO::AIO::max_poll_time $TICK * 0.2; 2979 IO::AIO::max_poll_time $TICK * 0.1;
2439
2440$AIO_POLL_WATCHER = Event->io ( 2980 $AIO_POLL_WATCHER = Event->io (
2441 fd => IO::AIO::poll_fileno, 2981 reentrant => 0,
2442 poll => 'r',
2443 prio => 5,
2444 data => WF_AUTOCANCEL,
2445 cb => \&IO::AIO::poll_cb,
2446);
2447
2448$WRITE_RUNTIME_WATCHER = Event->timer (
2449 data => WF_AUTOCANCEL, 2982 data => WF_AUTOCANCEL,
2450 after => 0, 2983 fd => IO::AIO::poll_fileno,
2451 interval => 10, 2984 poll => 'r',
2452 cb => sub { 2985 prio => 6,
2453 (Coro::unblock_sub { 2986 cb => \&IO::AIO::poll_cb,
2454 write_runtime 2987 );
2455 or warn "ERROR: unable to write runtime file: $!"; 2988}
2989
2990my $_log_backtrace;
2991
2992sub _log_backtrace {
2993 my ($msg, @addr) = @_;
2994
2995 $msg =~ s/\n//;
2996
2997 # limit the # of concurrent backtraces
2998 if ($_log_backtrace < 2) {
2999 ++$_log_backtrace;
3000 async {
3001 my @bt = fork_call {
3002 @addr = map { sprintf "%x", $_ } @addr;
3003 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3004 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3005 or die "addr2line: $!";
3006
3007 my @funcs;
3008 my @res = <$fh>;
3009 chomp for @res;
3010 while (@res) {
3011 my ($func, $line) = splice @res, 0, 2, ();
3012 push @funcs, "[$func] $line";
3013 }
3014
3015 @funcs
3016 };
3017
3018 LOG llevInfo, "[ABT] $msg\n";
3019 LOG llevInfo, "[ABT] $_\n" for @bt;
3020 --$_log_backtrace;
2456 })->(); 3021 };
3022 } else {
3023 LOG llevInfo, "[ABT] $msg\n";
3024 LOG llevInfo, "[ABT] [suppressed]\n";
2457 }, 3025 }
2458); 3026}
3027
3028# load additional modules
3029use cf::pod;
2459 3030
2460END { cf::emergency_save } 3031END { cf::emergency_save }
2461 3032
24621 30331
2463 3034

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines