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.186 by root, Sat Jan 20 01:12:39 2007 UTC vs.
Revision 1.308 by root, Mon Jul 16 14:09:40 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 JSON::XS 1.4 ();
26use BDB ();
20use Data::Dumper; 27use Data::Dumper;
21use Digest::MD5; 28use Digest::MD5;
22use Fcntl; 29use Fcntl;
30use YAML::Syck ();
23use IO::AIO 2.32 (); 31use IO::AIO 2.32 ();
24use YAML::Syck ();
25use Time::HiRes; 32use Time::HiRes;
33use Compress::LZF;
34use Digest::MD5 ();
26 35
36# configure various modules to our taste
37#
38$Storable::canonical = 1; # reduce rsync transfers
39Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
40Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
41
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 42$Event::Eval = 1; # no idea why this is required, but it is
28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 43
31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
32$YAML::Syck::ImplicitUnicode = 1; 45$YAML::Syck::ImplicitUnicode = 1;
33 46
34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
35 48
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50
36our %COMMAND = (); 51our %COMMAND = ();
37our %COMMAND_TIME = (); 52our %COMMAND_TIME = ();
38 53
39our @EXTS = (); # list of extension package names 54our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 55our %EXTCMD = ();
56our %EXTICMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 57our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps 58our %EXT_MAP = (); # pluggable maps
43 59
60our $RELOAD; # number of reloads so far
44our @EVENT; 61our @EVENT;
45our $LIBDIR = datadir . "/ext";
46 62
47our $TICK = MAX_TIME * 1e-6; 63our $CONFDIR = confdir;
64our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir;
68our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db";
74
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
48our $TICK_WATCHER; 76our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 77our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
51our $NEXT_TICK; 79our $NEXT_TICK;
52our $NOW; 80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off
82
83our $BDB_POLL_WATCHER;
84our $DB_ENV;
53 85
54our %CFG; 86our %CFG;
55 87
56our $UPTIME; $UPTIME ||= time; 88our $UPTIME; $UPTIME ||= time;
57our $RUNTIME; 89our $RUNTIME;
58 90
59our %PLAYER; # all users 91our %PLAYER; # all users
60our %MAP; # all maps 92our %MAP; # all maps
61our $LINK_MAP; # the special {link} map, which is always available 93our $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 94
67# used to convert map paths into valid unix filenames by replacing / by ∕ 95# used to convert map paths into valid unix filenames by replacing / by ∕
68our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
69 97
98our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing
100our $tick_start; # for load detecting purposes
101
70binmode STDOUT; 102binmode STDOUT;
71binmode STDERR; 103binmode STDERR;
72 104
73# read virtual server time, if available 105# read virtual server time, if available
74unless ($RUNTIME || !-e cf::localdir . "/runtime") { 106unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
75 open my $fh, "<", cf::localdir . "/runtime" 107 open my $fh, "<", "$LOCALDIR/runtime"
76 or die "unable to read runtime file: $!"; 108 or die "unable to read runtime file: $!";
77 $RUNTIME = <$fh> + 0.; 109 $RUNTIME = <$fh> + 0.;
78} 110}
79 111
80mkdir cf::localdir; 112mkdir $_
81mkdir cf::localdir . "/" . cf::playerdir; 113 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
82mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS;
85 114
86our $EMERGENCY_POSITION; 115our $EMERGENCY_POSITION;
116
117sub cf::map::normalise;
87 118
88############################################################################# 119#############################################################################
89 120
90=head2 GLOBAL VARIABLES 121=head2 GLOBAL VARIABLES
91 122
98=item $cf::RUNTIME 129=item $cf::RUNTIME
99 130
100The time this server has run, starts at 0 and is increased by $cf::TICK on 131The time this server has run, starts at 0 and is increased by $cf::TICK on
101every server tick. 132every server tick.
102 133
103=item $cf::LIBDIR 134=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
135$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
136$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
104 137
105The perl library directory, where extensions and cf-specific modules can 138Various directories - "/etc", read-only install directory, perl-library
106be found. It will be added to C<@INC> automatically. 139directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
140unique-items directory, player file directory, random maps directory and
141database environment.
107 142
108=item $cf::NOW 143=item $cf::NOW
109 144
110The time of the last (current) server tick. 145The time of the last (current) server tick.
111 146
112=item $cf::TICK 147=item $cf::TICK
113 148
114The interval between server ticks, in seconds. 149The interval between server ticks, in seconds.
150
151=item $cf::LOADAVG
152
153The current CPU load on the server (alpha-smoothed), as a value between 0
154(none) and 1 (overloaded), indicating how much time is spent on processing
155objects per tick. Healthy values are < 0.5.
156
157=item $cf::LOAD
158
159The raw value load value from the last tick.
115 160
116=item %cf::CFG 161=item %cf::CFG
117 162
118Configuration for the server, loaded from C</etc/crossfire/config>, or 163Configuration for the server, loaded from C</etc/crossfire/config>, or
119from wherever your confdir points to. 164from wherever your confdir points to.
120 165
121=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 166=item cf::wait_for_tick, cf::wait_for_tick_begin
122 167
123These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 168These 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 169returns 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 170per 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 171
128=back 172=back
129 173
130=cut 174=cut
131 175
132BEGIN { 176BEGIN {
133 *CORE::GLOBAL::warn = sub { 177 *CORE::GLOBAL::warn = sub {
134 my $msg = join "", @_; 178 my $msg = join "", @_;
135 utf8::encode $msg;
136 179
137 $msg .= "\n" 180 $msg .= "\n"
138 unless $msg =~ /\n$/; 181 unless $msg =~ /\n$/;
139 182
183 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
184
185 utf8::encode $msg;
140 LOG llevError, $msg; 186 LOG llevError, $msg;
141 }; 187 };
142} 188}
143 189
144@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 190@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
145@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 191@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
146@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 192@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
147@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 193@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
148@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 194@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
195@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
149@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 196@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
150 197
151# we bless all objects into (empty) derived classes to force a method lookup 198# we bless all objects into (empty) derived classes to force a method lookup
152# within the Safe compartment. 199# within the Safe compartment.
153for my $pkg (qw( 200for my $pkg (qw(
154 cf::global cf::attachable 201 cf::global cf::attachable
162} 209}
163 210
164$Event::DIED = sub { 211$Event::DIED = sub {
165 warn "error in event callback: @_"; 212 warn "error in event callback: @_";
166}; 213};
214
215#############################################################################
167 216
168=head2 UTILITY FUNCTIONS 217=head2 UTILITY FUNCTIONS
169 218
170=over 4 219=over 4
171 220
190 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 239 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
191 $d 240 $d
192 } || "[unable to dump $_[0]: '$@']"; 241 } || "[unable to dump $_[0]: '$@']";
193} 242}
194 243
195use JSON::Syck (); # TODO# replace by JSON::PC once working
196
197=item $ref = cf::from_json $json 244=item $ref = cf::from_json $json
198 245
199Converts a JSON string into the corresponding perl data structure. 246Converts a JSON string into the corresponding perl data structure.
200 247
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 248=item $json = cf::to_json $ref
209 249
210Converts a perl data structure into its JSON representation. 250Converts a perl data structure into its JSON representation.
211 251
212=cut 252=cut
213 253
214sub to_json($) { 254our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
215 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 255
216 JSON::Syck::Dump $_[0] 256sub to_json ($) { $json_coder->encode ($_[0]) }
217} 257sub from_json ($) { $json_coder->decode ($_[0]) }
218 258
219=item cf::lock_wait $string 259=item cf::lock_wait $string
220 260
221Wait until the given lock is available. See cf::lock_acquire. 261Wait until the given lock is available. See cf::lock_acquire.
222 262
228returned. 268returned.
229 269
230Lock names should begin with a unique identifier (for example, cf::map::find 270Lock names should begin with a unique identifier (for example, cf::map::find
231uses map_find and cf::map::load uses map_load). 271uses map_find and cf::map::load uses map_load).
232 272
273=item $locked = cf::lock_active $string
274
275Return true if the lock is currently active, i.e. somebody has locked it.
276
233=cut 277=cut
234 278
235our %LOCK; 279our %LOCK;
236 280
237sub lock_wait($) { 281sub lock_wait($) {
256 # wake up all waiters, to be on the safe side 300 # wake up all waiters, to be on the safe side
257 $_->ready for @{ delete $LOCK{$key} }; 301 $_->ready for @{ delete $LOCK{$key} };
258 } 302 }
259} 303}
260 304
305sub lock_active($) {
306 my ($key) = @_;
307
308 ! ! $LOCK{$key}
309}
310
261sub freeze_mainloop { 311sub freeze_mainloop {
262 return unless $TICK_WATCHER->is_active; 312 return unless $TICK_WATCHER->is_active;
263 313
264 my $guard = Coro::guard { 314 my $guard = Coro::guard {
265 $TICK_WATCHER->start; 315 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 }; 316 };
268 $WRITE_RUNTIME_WATCHER->stop;
269 $TICK_WATCHER->stop; 317 $TICK_WATCHER->stop;
270 $guard 318 $guard
271} 319}
272 320
273=item cf::async { BLOCK } 321=item cf::async { BLOCK }
280 328
281BEGIN { *async = \&Coro::async_pool } 329BEGIN { *async = \&Coro::async_pool }
282 330
283=item cf::sync_job { BLOCK } 331=item cf::sync_job { BLOCK }
284 332
285The design of crossfire+ requires that the main coro ($Coro::main) is 333The design of Crossfire TRT requires that the main coroutine ($Coro::main)
286always able to handle events or runnable, as crossfire+ is only partly 334is always able to handle events or runnable, as Crossfire TRT is only
287reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 335partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
336acceptable.
288 337
289If it must be done, put the blocking parts into C<sync_job>. This will run 338If it must be done, put the blocking parts into C<sync_job>. This will run
290the given BLOCK in another coroutine while waiting for the result. The 339the given BLOCK in another coroutine while waiting for the result. The
291server will be frozen during this time, so the block should either finish 340server will be frozen during this time, so the block should either finish
292fast or be very important. 341fast or be very important.
295 344
296sub sync_job(&) { 345sub sync_job(&) {
297 my ($job) = @_; 346 my ($job) = @_;
298 347
299 if ($Coro::current == $Coro::main) { 348 if ($Coro::current == $Coro::main) {
349 my $time = Event::time;
350
300 # this is the main coro, too bad, we have to block 351 # this is the main coro, too bad, we have to block
301 # till the operation succeeds, freezing the server :/ 352 # till the operation succeeds, freezing the server :/
302 353
303 # TODO: use suspend/resume instead 354 # TODO: use suspend/resume instead
304 # (but this is cancel-safe) 355 # (but this is cancel-safe)
315 366
316 while ($busy) { 367 while ($busy) {
317 Coro::cede or Event::one_event; 368 Coro::cede or Event::one_event;
318 } 369 }
319 370
371 $time = Event::time - $time;
372
373 LOG llevError | logBacktrace, Carp::longmess "long sync job"
374 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
375
376 $tick_start += $time; # do not account sync jobs to server load
377
320 wantarray ? @res : $res[0] 378 wantarray ? @res : $res[0]
321 } else { 379 } else {
322 # we are in another coroutine, how wonderful, everything just works 380 # we are in another coroutine, how wonderful, everything just works
323 381
324 $job->() 382 $job->()
343 $EXT_CORO{$coro+0} = $coro; 401 $EXT_CORO{$coro+0} = $coro;
344 402
345 $coro 403 $coro
346} 404}
347 405
348sub write_runtime { 406=item fork_call { }, $args
349 my $runtime = cf::localdir . "/runtime";
350 407
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 408Executes the given code block with the given arguments in a seperate
352 or return; 409process, returning the results. Everything must be serialisable with
410Coro::Storable. May, of course, block. Note that the executed sub may
411never block itself or use any form of Event handling.
353 412
354 my $value = $cf::RUNTIME + 90 + 10; 413=cut
355 # 10 is the runtime save interval, for a monotonic clock
356 # 60 allows for the watchdog to kill the server.
357 414
358 (aio_write $fh, 0, (length $value), $value, 0) <= 0 415sub _store_scalar {
359 and return; 416 open my $fh, ">", \my $buf
360 417 or die "fork_call: cannot open fh-to-buf in child : $!";
361 aio_fsync $fh 418 Storable::store_fd $_[0], $fh;
362 and return;
363
364 close $fh 419 close $fh;
365 or return;
366 420
367 aio_rename "$runtime~", $runtime 421 $buf
368 and return; 422}
369 423
424sub fork_call(&@) {
425 my ($cb, @args) = @_;
426
427# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
428# or die "socketpair: $!";
429 pipe my $fh1, my $fh2
430 or die "pipe: $!";
431
432 if (my $pid = fork) {
433 close $fh2;
434
435 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
436 warn "pst<$res>" unless $res =~ /^pst/;
437 $res = Coro::Storable::thaw $res;
438
439 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
440
441 Carp::confess $$res unless "ARRAY" eq ref $res;
442
443 return wantarray ? @$res : $res->[-1];
444 } else {
445 reset_signals;
446 local $SIG{__WARN__};
447 local $SIG{__DIE__};
448 # just in case, this hack effectively disables event
449 # in the child. cleaner and slower would be canceling all watchers,
450 # but this works for the time being.
451 local $Coro::idle;
452 $Coro::current->prio (Coro::PRIO_MAX);
453
454 eval {
455 close $fh1;
456
457 my @res = eval { $cb->(@args) };
458
459 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
460 close $fh2;
461 };
462
463 warn $@ if $@;
464 _exit 0;
370 1 465 }
466}
467
468=item $value = cf::db_get $family => $key
469
470Returns a single value from the environment database.
471
472=item cf::db_put $family => $key => $value
473
474Stores the given C<$value> in the family. It can currently store binary
475data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
476
477=cut
478
479our $DB;
480
481sub db_init {
482 unless ($DB) {
483 $DB = BDB::db_create $DB_ENV;
484
485 cf::sync_job {
486 eval {
487 $DB->set_flags (BDB::CHKSUM);
488
489 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
490 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
491 cf::cleanup "db_open(db): $!" if $!;
492 };
493 cf::cleanup "db_open(db): $@" if $@;
494 };
495 }
496}
497
498sub db_get($$) {
499 my $key = "$_[0]/$_[1]";
500
501 cf::sync_job {
502 BDB::db_get $DB, undef, $key, my $data;
503
504 $! ? ()
505 : $data
506 }
507}
508
509sub db_put($$$) {
510 BDB::dbreq_pri 4;
511 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
512}
513
514=item cf::cache $id => [$paths...], $processversion => $process
515
516Generic caching function that returns the value of the resource $id,
517caching and regenerating as required.
518
519This function can block.
520
521=cut
522
523sub cache {
524 my ($id, $src, $processversion, $process) = @_;
525
526 my $meta =
527 join "\x00",
528 $processversion,
529 map {
530 aio_stat $_
531 and Carp::croak "$_: $!";
532
533 ($_, (stat _)[7,9])
534 } @$src;
535
536 my $dbmeta = db_get cache => "$id/meta";
537 if ($dbmeta ne $meta) {
538 # changed, we may need to process
539
540 my @data;
541 my $md5;
542
543 for (0 .. $#$src) {
544 0 <= aio_load $src->[$_], $data[$_]
545 or Carp::croak "$src->[$_]: $!";
546 }
547
548 # if processing is expensive, check
549 # checksum first
550 if (1) {
551 $md5 =
552 join "\x00",
553 $processversion,
554 map {
555 Coro::cede;
556 ($src->[$_], Digest::MD5::md5_hex $data[$_])
557 } 0.. $#$src;
558
559
560 my $dbmd5 = db_get cache => "$id/md5";
561 if ($dbmd5 eq $md5) {
562 db_put cache => "$id/meta", $meta;
563
564 return db_get cache => "$id/data";
565 }
566 }
567
568 my $t1 = Time::HiRes::time;
569 my $data = $process->(\@data);
570 my $t2 = Time::HiRes::time;
571
572 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
573
574 db_put cache => "$id/data", $data;
575 db_put cache => "$id/md5" , $md5;
576 db_put cache => "$id/meta", $meta;
577
578 return $data;
579 }
580
581 db_get cache => "$id/data"
582}
583
584=item cf::datalog type => key => value, ...
585
586Log a datalog packet of the given type with the given key-value pairs.
587
588=cut
589
590sub datalog($@) {
591 my ($type, %kv) = @_;
592 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
371} 593}
372 594
373=back 595=back
374 596
375=cut 597=cut
382attach callbacks/event handlers (a collection of which is called an "attachment") 604attach callbacks/event handlers (a collection of which is called an "attachment")
383to it. All such attachable objects support the following methods. 605to it. All such attachable objects support the following methods.
384 606
385In the following description, CLASS can be any of C<global>, C<object> 607In the following description, CLASS can be any of C<global>, C<object>
386C<player>, C<client> or C<map> (i.e. the attachable objects in 608C<player>, C<client> or C<map> (i.e. the attachable objects in
387crossfire+). 609Crossfire TRT).
388 610
389=over 4 611=over 4
390 612
391=item $attachable->attach ($attachment, key => $value...) 613=item $attachable->attach ($attachment, key => $value...)
392 614
555 $registry = $CB_TYPE[$object_type] ||= []; 777 $registry = $CB_TYPE[$object_type] ||= [];
556 778
557 } elsif ($type eq "subtype") { 779 } elsif ($type eq "subtype") {
558 defined $object_type or Carp::croak "subtype specified without type"; 780 defined $object_type or Carp::croak "subtype specified without type";
559 my $object_subtype = shift @arg; 781 my $object_subtype = shift @arg;
560 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 782 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
561 783
562 } elsif ($type eq "package") { 784 } elsif ($type eq "package") {
563 my $pkg = shift @arg; 785 my $pkg = shift @arg;
564 786
565 while (my ($name, $id) = each %cb_id) { 787 while (my ($name, $id) = each %cb_id) {
594 _attach $registry, $klass, @attach; 816 _attach $registry, $klass, @attach;
595 } 817 }
596 818
597 $obj->{$name} = \%arg; 819 $obj->{$name} = \%arg;
598 } else { 820 } else {
599 warn "object uses attachment '$name' that is not available, postponing.\n"; 821 warn "object uses attachment '$name' which is not available, postponing.\n";
600 } 822 }
601 823
602 $obj->{_attachment}{$name} = undef; 824 $obj->{_attachment}{$name} = undef;
603} 825}
604 826
606 if (ref $_[0]) { 828 if (ref $_[0]) {
607 _object_attach @_; 829 _object_attach @_;
608 } else { 830 } else {
609 _attach shift->_attach_registry, @_; 831 _attach shift->_attach_registry, @_;
610 } 832 }
833 _recalc_want;
611}; 834};
612 835
613# all those should be optimised 836# all those should be optimised
614sub cf::attachable::detach { 837sub cf::attachable::detach {
615 my ($obj, $name) = @_; 838 my ($obj, $name) = @_;
618 delete $obj->{_attachment}{$name}; 841 delete $obj->{_attachment}{$name};
619 reattach ($obj); 842 reattach ($obj);
620 } else { 843 } else {
621 Carp::croak "cannot, currently, detach class attachments"; 844 Carp::croak "cannot, currently, detach class attachments";
622 } 845 }
846 _recalc_want;
623}; 847};
624 848
625sub cf::attachable::attached { 849sub cf::attachable::attached {
626 my ($obj, $name) = @_; 850 my ($obj, $name) = @_;
627 851
750 $filename, length $$rdata, scalar @$objs; 974 $filename, length $$rdata, scalar @$objs;
751 975
752 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 976 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
753 chmod SAVE_MODE, $fh; 977 chmod SAVE_MODE, $fh;
754 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 978 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
755 aio_fsync $fh; 979 aio_fsync $fh if $cf::USE_FSYNC;
756 close $fh; 980 close $fh;
757 981
758 if (@$objs) { 982 if (@$objs) {
759 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 983 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
760 chmod SAVE_MODE, $fh; 984 chmod SAVE_MODE, $fh;
761 my $data = Storable::nfreeze { version => 1, objs => $objs }; 985 my $data = Storable::nfreeze { version => 1, objs => $objs };
762 aio_write $fh, 0, (length $data), $data, 0; 986 aio_write $fh, 0, (length $data), $data, 0;
763 aio_fsync $fh; 987 aio_fsync $fh if $cf::USE_FSYNC;
764 close $fh; 988 close $fh;
765 aio_rename "$filename.pst~", "$filename.pst"; 989 aio_rename "$filename.pst~", "$filename.pst";
766 } 990 }
767 } else { 991 } else {
768 aio_unlink "$filename.pst"; 992 aio_unlink "$filename.pst";
800 or return; 1024 or return;
801 $av = eval { (Storable::thaw $av)->{objs} }; 1025 $av = eval { (Storable::thaw $av)->{objs} };
802 } 1026 }
803 1027
804 warn sprintf "loading %s (%d)\n", 1028 warn sprintf "loading %s (%d)\n",
805 $filename, length $data, scalar @{$av || []};#d# 1029 $filename, length $data, scalar @{$av || []};
806 return ($data, $av); 1030 return ($data, $av);
807} 1031}
1032
1033=head2 COMMAND CALLBACKS
1034
1035=over 4
1036
1037=cut
808 1038
809############################################################################# 1039#############################################################################
810# command handling &c 1040# command handling &c
811 1041
812=item cf::register_command $name => \&callback($ob,$args); 1042=item cf::register_command $name => \&callback($ob,$args);
825 push @{ $COMMAND{$name} }, [$caller, $cb]; 1055 push @{ $COMMAND{$name} }, [$caller, $cb];
826} 1056}
827 1057
828=item cf::register_extcmd $name => \&callback($pl,$packet); 1058=item cf::register_extcmd $name => \&callback($pl,$packet);
829 1059
830Register a callbackf ro execution when the client sends an extcmd packet. 1060Register a callback for execution when the client sends an (synchronous)
1061extcmd packet. Ext commands will be processed in the order they are
1062received by the server, like other user commands. The first argument is
1063the logged-in player. Ext commands can only be processed after a player
1064has logged in successfully.
831 1065
832If the callback returns something, it is sent back as if reply was being 1066If the callback returns something, it is sent back as if reply was being
833called. 1067called.
834 1068
1069=item cf::register_exticmd $name => \&callback($ns,$packet);
1070
1071Register a callback for execution when the client sends an (asynchronous)
1072exticmd packet. Exti commands are processed by the server as soon as they
1073are received, i.e. out of order w.r.t. other commands. The first argument
1074is a client socket. Exti commands can be received anytime, even before
1075log-in.
1076
1077If the callback returns something, it is sent back as if reply was being
1078called.
1079
835=cut 1080=cut
836 1081
837sub register_extcmd { 1082sub register_extcmd {
838 my ($name, $cb) = @_; 1083 my ($name, $cb) = @_;
839 1084
840 $EXTCMD{$name} = $cb; 1085 $EXTCMD{$name} = $cb;
1086}
1087
1088sub register_exticmd {
1089 my ($name, $cb) = @_;
1090
1091 $EXTICMD{$name} = $cb;
841} 1092}
842 1093
843cf::player->attach ( 1094cf::player->attach (
844 on_command => sub { 1095 on_command => sub {
845 my ($pl, $name, $params) = @_; 1096 my ($pl, $name, $params) = @_;
854 cf::override; 1105 cf::override;
855 }, 1106 },
856 on_extcmd => sub { 1107 on_extcmd => sub {
857 my ($pl, $buf) = @_; 1108 my ($pl, $buf) = @_;
858 1109
859 my $msg = eval { from_json $buf }; 1110 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
860 1111
861 if (ref $msg) { 1112 if (ref $msg) {
862 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1113 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
863 if (my %reply = $cb->($pl, $msg)) { 1114 if (my %reply = $cb->($pl, $msg)) {
864 $pl->ext_reply ($msg->{msgid}, %reply); 1115 $pl->ext_reply ($msg->{msgid}, %reply);
870 1121
871 cf::override; 1122 cf::override;
872 }, 1123 },
873); 1124);
874 1125
875sub load_extension {
876 my ($path) = @_;
877
878 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
879 my $base = $1;
880 my $pkg = $1;
881 $pkg =~ s/[^[:word:]]/_/g;
882 $pkg = "ext::$pkg";
883
884 warn "... loading '$path' into '$pkg'\n";
885
886 open my $fh, "<:utf8", $path
887 or die "$path: $!";
888
889 my $source =
890 "package $pkg; use strict; use utf8;\n"
891 . "#line 1 \"$path\"\n{\n"
892 . (do { local $/; <$fh> })
893 . "\n};\n1";
894
895 unless (eval $source) {
896 my $msg = $@ ? "$path: $@\n"
897 : "extension disabled.\n";
898 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
899 warn $@;
900 warn "mandatory extension failed to load, exiting.\n";
901 exit 1;
902 }
903 die $@;
904 }
905
906 push @EXTS, $pkg;
907}
908
909sub load_extensions { 1126sub load_extensions {
1127 cf::sync_job {
1128 my %todo;
1129
910 for my $ext (<$LIBDIR/*.ext>) { 1130 for my $path (<$LIBDIR/*.ext>) {
911 next unless -r $ext; 1131 next unless -r $path;
912 eval { 1132
913 load_extension $ext; 1133 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1134 my $base = $1;
1135 my $pkg = $1;
1136 $pkg =~ s/[^[:word:]]/_/g;
1137 $pkg = "ext::$pkg";
1138
1139 open my $fh, "<:utf8", $path
1140 or die "$path: $!";
1141
1142 my $source = do { local $/; <$fh> };
1143
1144 my %ext = (
1145 path => $path,
1146 base => $base,
1147 pkg => $pkg,
1148 );
1149
1150 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1151 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1152
1153 $ext{source} =
1154 "package $pkg; use strict; use utf8;\n"
1155 . "#line 1 \"$path\"\n{\n"
1156 . $source
1157 . "\n};\n1";
1158
1159 $todo{$base} = \%ext;
1160 }
1161
1162 my %done;
1163 while (%todo) {
1164 my $progress;
1165
1166 while (my ($k, $v) = each %todo) {
1167 for (split /,\s*/, $v->{meta}{depends}) {
1168 goto skip
1169 unless exists $done{$_};
1170 }
1171
1172 warn "... loading '$k' into '$v->{pkg}'\n";
1173
1174 unless (eval $v->{source}) {
1175 my $msg = $@ ? "$v->{path}: $@\n"
1176 : "$v->{base}: extension inactive.\n";
1177
1178 if (exists $v->{meta}{mandatory}) {
1179 warn $msg;
1180 warn "mandatory extension failed to load, exiting.\n";
1181 exit 1;
1182 }
1183
1184 warn $msg;
1185 }
1186
1187 $done{$k} = delete $todo{$k};
1188 push @EXTS, $v->{pkg};
1189 $progress = 1;
914 1 1190 }
915 } or warn "$ext not loaded: $@"; 1191
1192 skip:
1193 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1194 unless $progress;
1195 }
916 } 1196 };
917} 1197}
918 1198
919############################################################################# 1199#############################################################################
920 1200
1201=back
1202
921=head2 CORE EXTENSIONS 1203=head2 CORE EXTENSIONS
922 1204
923Functions and methods that extend core crossfire objects. 1205Functions and methods that extend core crossfire objects.
924 1206
925=cut 1207=cut
937Returns the given player object, loading it if necessary (might block). 1219Returns the given player object, loading it if necessary (might block).
938 1220
939=cut 1221=cut
940 1222
941sub playerdir($) { 1223sub playerdir($) {
942 cf::localdir 1224 "$PLAYERDIR/"
943 . "/"
944 . cf::playerdir
945 . "/"
946 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1225 . (ref $_[0] ? $_[0]->ob->name : $_[0])
947} 1226}
948 1227
949sub path($) { 1228sub path($) {
950 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1229 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
951 1230
952 (playerdir $login) . "/$login.pl" 1231 (playerdir $login) . "/playerdata"
953} 1232}
954 1233
955sub find_active($) { 1234sub find_active($) {
956 $cf::PLAYER{$_[0]} 1235 $cf::PLAYER{$_[0]}
957 and $cf::PLAYER{$_[0]}->active 1236 and $cf::PLAYER{$_[0]}->active
970 my $login = $_[0]; 1249 my $login = $_[0];
971 1250
972 my $guard = cf::lock_acquire "user_find:$login"; 1251 my $guard = cf::lock_acquire "user_find:$login";
973 1252
974 $cf::PLAYER{$_[0]} || do { 1253 $cf::PLAYER{$_[0]} || do {
1254 # rename old playerfiles to new ones
1255 #TODO: remove when no longer required
1256 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1257 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1258 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1259 aio_unlink +(playerdir $login) . "/$login.pl";
1260
975 my $pl = load_pl path $login 1261 my $pl = load_pl path $login
976 or return; 1262 or return;
977 $cf::PLAYER{$login} = $pl 1263 $cf::PLAYER{$login} = $pl
978 } 1264 }
979 } 1265 }
1016 1302
1017=cut 1303=cut
1018 1304
1019sub quit_character { 1305sub quit_character {
1020 my ($pl) = @_; 1306 my ($pl) = @_;
1307
1308 my $name = $pl->ob->name;
1021 1309
1022 $pl->{deny_save} = 1; 1310 $pl->{deny_save} = 1;
1023 $pl->password ("*"); # this should lock out the player until we nuked the dir 1311 $pl->password ("*"); # this should lock out the player until we nuked the dir
1024 1312
1025 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1313 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1030 my $path = playerdir $pl; 1318 my $path = playerdir $pl;
1031 my $temp = "$path~$cf::RUNTIME~deleting~"; 1319 my $temp = "$path~$cf::RUNTIME~deleting~";
1032 aio_rename $path, $temp; 1320 aio_rename $path, $temp;
1033 delete $cf::PLAYER{$pl->ob->name}; 1321 delete $cf::PLAYER{$pl->ob->name};
1034 $pl->destroy; 1322 $pl->destroy;
1323
1324 my $prefix = qr<^~\Q$name\E/>;
1325
1326 # nuke player maps
1327 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1328
1035 IO::AIO::aio_rmtree $temp; 1329 IO::AIO::aio_rmtree $temp;
1330}
1331
1332=item $pl->kick
1333
1334Kicks a player out of the game. This destroys the connection.
1335
1336=cut
1337
1338sub kick {
1339 my ($pl, $kicker) = @_;
1340
1341 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1342 $pl->killer ("kicked");
1343 $pl->ns->destroy;
1036} 1344}
1037 1345
1038=item cf::player::list_logins 1346=item cf::player::list_logins
1039 1347
1040Returns am arrayref of all valid playernames in the system, can take a 1348Returns am arrayref of all valid playernames in the system, can take a
1041while and may block, so not sync_job-capable, ever. 1349while and may block, so not sync_job-capable, ever.
1042 1350
1043=cut 1351=cut
1044 1352
1045sub list_logins { 1353sub list_logins {
1046 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1354 my $dirs = aio_readdir $PLAYERDIR
1047 or return []; 1355 or return [];
1048 1356
1049 my @logins; 1357 my @logins;
1050 1358
1051 for my $login (@$dirs) { 1359 for my $login (@$dirs) {
1068=cut 1376=cut
1069 1377
1070sub maps($) { 1378sub maps($) {
1071 my ($pl) = @_; 1379 my ($pl) = @_;
1072 1380
1381 $pl = ref $pl ? $pl->ob->name : $pl;
1382
1073 my $files = aio_readdir playerdir $pl 1383 my $files = aio_readdir playerdir $pl
1074 or return; 1384 or return;
1075 1385
1076 my @paths; 1386 my @paths;
1077 1387
1078 for (@$files) { 1388 for (@$files) {
1079 utf8::decode $_; 1389 utf8::decode $_;
1080 next if /\.(?:pl|pst)$/; 1390 next if /\.(?:pl|pst)$/;
1081 next unless /^$PATH_SEP/o; 1391 next unless /^$PATH_SEP/o;
1082 1392
1083 s/\.map$//; 1393 push @paths, cf::map::normalise "~$pl/$_";
1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1085 } 1394 }
1086 1395
1087 \@paths 1396 \@paths
1088} 1397}
1089 1398
1399=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1400
1401Expand crossfire pod fragments into protocol xml.
1402
1403=cut
1404
1405sub expand_cfpod {
1406 ((my $self), (local $_)) = @_;
1407
1408 # escape & and <
1409 s/&/&amp;/g;
1410 s/(?<![BIUGH])</&lt;/g;
1411
1412 # this is buggy, it needs to properly take care of nested <'s
1413
1414 1 while
1415 # replace B<>, I<>, U<> etc.
1416 s/B<([^\>]*)>/<b>$1<\/b>/
1417 || s/I<([^\>]*)>/<i>$1<\/i>/
1418 || s/U<([^\>]*)>/<u>$1<\/u>/
1419 # replace G<male|female> tags
1420 || s{G<([^>|]*)\|([^>]*)>}{
1421 $self->gender ? $2 : $1
1422 }ge
1423 # replace H<hint text>
1424 || s{H<([^\>]*)>}
1425 {
1426 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1427 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1428 "")
1429 [$self->{hintmode}]
1430 }ge;
1431
1432 # create single paragraphs (very hackish)
1433 s/(?<=\S)\n(?=\w)/ /g;
1434
1435 # compress some whitespace
1436 s/\s+\n/\n/g; # ws line-ends
1437 s/\n\n+/\n/g; # double lines
1438 s/^\n+//; # beginning lines
1439 s/\n+$//; # ending lines
1440
1441 $_
1442}
1443
1444sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode}
1447}
1448
1090=item $player->ext_reply ($msgid, $msgtype, %msg) 1449=item $player->ext_reply ($msgid, %msg)
1091 1450
1092Sends an ext reply to the player. 1451Sends an ext reply to the player.
1093 1452
1094=cut 1453=cut
1095 1454
1096sub ext_reply($$$%) { 1455sub ext_reply($$%) {
1097 my ($self, $id, %msg) = @_; 1456 my ($self, $id, %msg) = @_;
1098 1457
1099 $msg{msgid} = $id; 1458 $msg{msgid} = $id;
1100 1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1101 $self->send ("ext " . cf::to_json \%msg);
1102} 1460}
1103 1461
1104package cf; 1462=item $player->ext_event ($type, %msg)
1463
1464Sends an ext event to the client.
1465
1466=cut
1467
1468sub ext_event($$%) {
1469 my ($self, $type, %msg) = @_;
1470
1471 $self->ns->ext_event ($type, %msg);
1472}
1473
1474=head3 cf::region
1475
1476=over 4
1477
1478=cut
1479
1480package cf::region;
1481
1482=item cf::region::find_by_path $path
1483
1484Tries to decuce the likely region for a map knowing only its path.
1485
1486=cut
1487
1488sub find_by_path($) {
1489 my ($path) = @_;
1490
1491 my ($match, $specificity);
1492
1493 for my $region (list) {
1494 if ($region->{match} && $path =~ $region->{match}) {
1495 ($match, $specificity) = ($region, $region->specificity)
1496 if $region->specificity > $specificity;
1497 }
1498 }
1499
1500 $match
1501}
1105 1502
1106=back 1503=back
1107
1108 1504
1109=head3 cf::map 1505=head3 cf::map
1110 1506
1111=over 4 1507=over 4
1112 1508
1140 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1536 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1141 (cf::region::find $rmp->{region}), $rmp->{custom} 1537 (cf::region::find $rmp->{region}), $rmp->{custom}
1142 ) 1538 )
1143} 1539}
1144 1540
1541=item cf::map->register ($regex, $prio)
1542
1543Register a handler for the map path matching the given regex at the
1544givne priority (higher is better, built-in handlers have priority 0, the
1545default).
1546
1547=cut
1548
1145sub register { 1549sub register {
1146 my (undef, $regex) = @_; 1550 my (undef, $regex, $prio) = @_;
1147 my $pkg = caller; 1551 my $pkg = caller;
1148 1552
1149 no strict; 1553 no strict;
1150 push @{"$pkg\::ISA"}, __PACKAGE__; 1554 push @{"$pkg\::ISA"}, __PACKAGE__;
1151 1555
1152 $EXT_MAP{$pkg} = qr<$regex>; 1556 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1153} 1557}
1154 1558
1155# also paths starting with '/' 1559# also paths starting with '/'
1156$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1560$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1157 1561
1158sub thawer_merge { 1562sub thawer_merge {
1159 my ($self, $merge) = @_; 1563 my ($self, $merge) = @_;
1160 1564
1161 # we have to keep some variables in memory intact 1565 # we have to keep some variables in memory intact
1162 local $self->{path}; 1566 local $self->{path};
1163 local $self->{load_path}; 1567 local $self->{load_path};
1164 local $self->{deny_save};
1165 local $self->{deny_reset};
1166 1568
1167 $self->SUPER::thawer_merge ($merge); 1569 $self->SUPER::thawer_merge ($merge);
1168} 1570}
1169 1571
1170sub normalise { 1572sub normalise {
1171 my ($path, $base) = @_; 1573 my ($path, $base) = @_;
1574
1575 $path = "$path"; # make sure its a string
1576
1577 $path =~ s/\.map$//;
1172 1578
1173 # map plan: 1579 # map plan:
1174 # 1580 #
1175 # /! non-realised random map exit (special hack!) 1581 # /! non-realised random map exit (special hack!)
1176 # {... are special paths that are not being touched 1582 # {... are special paths that are not being touched
1204 1610
1205 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1611 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1206 1612
1207 $path = normalise $path, $base; 1613 $path = normalise $path, $base;
1208 1614
1209 for my $pkg (keys %EXT_MAP) { 1615 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1210 if ($path =~ $EXT_MAP{$pkg}) { 1616 if ($path =~ $EXT_MAP{$pkg}[1]) {
1211 my $self = bless cf::map::new, $pkg; 1617 my $self = bless cf::map::new, $pkg;
1212 $self->{path} = $path; $self->path ($path); 1618 $self->{path} = $path; $self->path ($path);
1213 $self->init; # pass $1 etc. 1619 $self->init; # pass $1 etc.
1214 return $self; 1620 return $self;
1215 } 1621 }
1216 } 1622 }
1217 1623
1218 Carp::carp "unable to resolve path '$path'."; 1624 Carp::cluck "unable to resolve path '$path' (base '$base').";
1219 () 1625 ()
1220} 1626}
1221 1627
1222sub init { 1628sub init {
1223 my ($self) = @_; 1629 my ($self) = @_;
1238 1644
1239# the original (read-only) location 1645# the original (read-only) location
1240sub load_path { 1646sub load_path {
1241 my ($self) = @_; 1647 my ($self) = @_;
1242 1648
1243 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1649 "$MAPDIR/$self->{path}.map"
1244} 1650}
1245 1651
1246# the temporary/swap location 1652# the temporary/swap location
1247sub save_path { 1653sub save_path {
1248 my ($self) = @_; 1654 my ($self) = @_;
1249 1655
1250 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1656 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1251 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1657 "$TMPDIR/$path.map"
1252} 1658}
1253 1659
1254# the unique path, undef == no special unique path 1660# the unique path, undef == no special unique path
1255sub uniq_path { 1661sub uniq_path {
1256 my ($self) = @_; 1662 my ($self) = @_;
1257 1663
1258 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1664 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1259 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1665 "$UNIQUEDIR/$path"
1260} 1666}
1261 1667
1262# and all this just because we cannot iterate over 1668# and all this just because we cannot iterate over
1263# all maps in C++... 1669# all maps in C++...
1264sub change_all_map_light { 1670sub change_all_map_light {
1266 1672
1267 $_->change_map_light ($change) 1673 $_->change_map_light ($change)
1268 for grep $_->outdoor, values %cf::MAP; 1674 for grep $_->outdoor, values %cf::MAP;
1269} 1675}
1270 1676
1677sub decay_objects {
1678 my ($self) = @_;
1679
1680 return if $self->{deny_reset};
1681
1682 $self->do_decay_objects;
1683}
1684
1271sub unlink_save { 1685sub unlink_save {
1272 my ($self) = @_; 1686 my ($self) = @_;
1273 1687
1274 utf8::encode (my $save = $self->save_path); 1688 utf8::encode (my $save = $self->save_path);
1275 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1689 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1278 1692
1279sub load_header_from($) { 1693sub load_header_from($) {
1280 my ($self, $path) = @_; 1694 my ($self, $path) = @_;
1281 1695
1282 utf8::encode $path; 1696 utf8::encode $path;
1283 aio_open $path, O_RDONLY, 0 1697 #aio_open $path, O_RDONLY, 0
1284 or return; 1698 # or return;
1285 1699
1286 $self->_load_header ($path) 1700 $self->_load_header ($path)
1287 or return; 1701 or return;
1288 1702
1289 $self->{load_path} = $path; 1703 $self->{load_path} = $path;
1290 1704
1291 1 1705 1
1292} 1706}
1293 1707
1294sub load_orig { 1708sub load_header_orig {
1295 my ($self) = @_; 1709 my ($self) = @_;
1296 1710
1297 $self->load_header_from ($self->load_path) 1711 $self->load_header_from ($self->load_path)
1298} 1712}
1299 1713
1300sub load_temp { 1714sub load_header_temp {
1301 my ($self) = @_; 1715 my ($self) = @_;
1302 1716
1303 $self->load_header_from ($self->save_path) 1717 $self->load_header_from ($self->save_path)
1718}
1719
1720sub prepare_temp {
1721 my ($self) = @_;
1722
1723 $self->last_access ((delete $self->{last_access})
1724 || $cf::RUNTIME); #d#
1725 # safety
1726 $self->{instantiate_time} = $cf::RUNTIME
1727 if $self->{instantiate_time} > $cf::RUNTIME;
1728}
1729
1730sub prepare_orig {
1731 my ($self) = @_;
1732
1733 $self->{load_original} = 1;
1734 $self->{instantiate_time} = $cf::RUNTIME;
1735 $self->last_access ($cf::RUNTIME);
1736 $self->instantiate;
1304} 1737}
1305 1738
1306sub load_header { 1739sub load_header {
1307 my ($self) = @_; 1740 my ($self) = @_;
1308 1741
1309 if ($self->load_temp) { 1742 if ($self->load_header_temp) {
1310 $self->last_access ((delete $self->{last_access}) 1743 $self->prepare_temp;
1311 || $cf::RUNTIME); #d#
1312 # safety
1313 $self->{instantiate_time} = $cf::RUNTIME
1314 if $self->{instantiate_time} > $cf::RUNTIME;
1315 } else { 1744 } else {
1316 $self->load_orig 1745 $self->load_header_orig
1317 or return; 1746 or return;
1318 1747 $self->prepare_orig;
1319 $self->{load_original} = 1;
1320 $self->{instantiate_time} = $cf::RUNTIME;
1321 $self->last_access ($cf::RUNTIME);
1322 $self->instantiate;
1323 } 1748 }
1749
1750 $self->{deny_reset} = 1
1751 if $self->no_reset;
1752
1753 $self->default_region (cf::region::find_by_path $self->{path})
1754 unless $self->default_region;
1324 1755
1325 1 1756 1
1326} 1757}
1327 1758
1328sub find; 1759sub find;
1341 $map->{last_save} = $cf::RUNTIME; 1772 $map->{last_save} = $cf::RUNTIME;
1342 1773
1343 $map->load_header 1774 $map->load_header
1344 or return; 1775 or return;
1345 1776
1346 if ($map->should_reset) { 1777 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1347 # doing this can freeze the server in a sync job, obviously 1778 # doing this can freeze the server in a sync job, obviously
1348 #$cf::WAIT_FOR_TICK->wait; 1779 #$cf::WAIT_FOR_TICK->wait;
1349 $map->reset; 1780 $map->reset;
1350 undef $guard; 1781 undef $guard;
1351 $map = find $path 1782 return find $path;
1352 or return;
1353 } 1783 }
1354 1784
1355 $cf::MAP{$path} = $map 1785 $cf::MAP{$path} = $map
1356 } 1786 }
1357} 1787}
1788
1789sub pre_load { }
1790sub post_load { }
1358 1791
1359sub load { 1792sub load {
1360 my ($self) = @_; 1793 my ($self) = @_;
1361 1794
1795 local $self->{deny_reset} = 1; # loading can take a long time
1796
1362 my $path = $self->{path}; 1797 my $path = $self->{path};
1798
1799 {
1363 my $guard = cf::lock_acquire "map_load:$path"; 1800 my $guard = cf::lock_acquire "map_load:$path";
1364 1801
1365 return if $self->in_memory != cf::MAP_SWAPPED; 1802 return if $self->in_memory != cf::MAP_SWAPPED;
1366 1803
1367 $self->in_memory (cf::MAP_LOADING); 1804 $self->in_memory (cf::MAP_LOADING);
1368 1805
1369 $self->alloc; 1806 $self->alloc;
1370 $self->_load_objects ($self->{load_path}, 1)
1371 or return;
1372 1807
1373 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1808 $self->pre_load;
1374 if delete $self->{load_original};
1375
1376 if (my $uniq = $self->uniq_path) {
1377 utf8::encode $uniq;
1378 if (aio_open $uniq, O_RDONLY, 0) {
1379 $self->clear_unique_items;
1380 $self->_load_objects ($uniq, 0);
1381 }
1382 }
1383
1384 Coro::cede;
1385
1386 # now do the right thing for maps
1387 $self->link_multipart_objects;
1388
1389 unless ($self->{deny_activate}) {
1390 $self->decay_objects;
1391 $self->fix_auto_apply;
1392 $self->update_buttons;
1393 Coro::cede; 1809 Coro::cede;
1394 $self->set_darkness_map; 1810
1811 $self->_load_objects ($self->{load_path}, 1)
1812 or return;
1813
1814 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1815 if delete $self->{load_original};
1816
1817 if (my $uniq = $self->uniq_path) {
1818 utf8::encode $uniq;
1819 if (aio_open $uniq, O_RDONLY, 0) {
1820 $self->clear_unique_items;
1821 $self->_load_objects ($uniq, 0);
1822 }
1823 }
1824
1825 Coro::cede;
1826 # now do the right thing for maps
1827 $self->link_multipart_objects;
1395 $self->difficulty ($self->estimate_difficulty) 1828 $self->difficulty ($self->estimate_difficulty)
1396 unless $self->difficulty; 1829 unless $self->difficulty;
1397 Coro::cede; 1830 Coro::cede;
1831
1832 unless ($self->{deny_activate}) {
1833 $self->decay_objects;
1834 $self->fix_auto_apply;
1835 $self->update_buttons;
1836 Coro::cede;
1837 $self->set_darkness_map;
1838 Coro::cede;
1398 $self->activate; 1839 $self->activate;
1399 } 1840 }
1400 1841
1401 $self->in_memory (cf::MAP_IN_MEMORY); 1842 $self->in_memory (cf::MAP_IN_MEMORY);
1843 }
1844
1845 $self->post_load;
1402} 1846}
1403 1847
1404sub customise_for { 1848sub customise_for {
1405 my ($self, $ob) = @_; 1849 my ($self, $ob) = @_;
1406 1850
1407 return find "~" . $ob->name . "/" . $self->{path} 1851 return find "~" . $ob->name . "/" . $self->{path}
1408 if $self->per_player; 1852 if $self->per_player;
1853
1854# return find "?party/" . $ob->name . "/" . $self->{path}
1855# if $self->per_party;
1409 1856
1410 $self 1857 $self
1411} 1858}
1412 1859
1413# find and load all maps in the 3x3 area around a map 1860# find and load all maps in the 3x3 area around a map
1460 1907
1461 undef $MAP_PREFETCH{$path}; 1908 undef $MAP_PREFETCH{$path};
1462 $MAP_PREFETCHER ||= cf::async { 1909 $MAP_PREFETCHER ||= cf::async {
1463 while (%MAP_PREFETCH) { 1910 while (%MAP_PREFETCH) {
1464 for my $path (keys %MAP_PREFETCH) { 1911 for my $path (keys %MAP_PREFETCH) {
1465 my $map = find $path 1912 if (my $map = find $path) {
1466 or next;
1467 $map->load; 1913 $map->load;
1914 }
1468 1915
1469 delete $MAP_PREFETCH{$path}; 1916 delete $MAP_PREFETCH{$path};
1470 } 1917 }
1471 } 1918 }
1472 undef $MAP_PREFETCHER; 1919 undef $MAP_PREFETCHER;
1473 }; 1920 };
1921 $MAP_PREFETCHER->prio (6);
1474 1922
1475 () 1923 ()
1476} 1924}
1477 1925
1478sub save { 1926sub save {
1523 1971
1524sub reset_at { 1972sub reset_at {
1525 my ($self) = @_; 1973 my ($self) = @_;
1526 1974
1527 # TODO: safety, remove and allow resettable per-player maps 1975 # TODO: safety, remove and allow resettable per-player maps
1528 return 1e99 if $self->isa ("ext::map_per_player");#d#
1529 return 1e99 if $self->{deny_reset}; 1976 return 1e99 if $self->{deny_reset};
1530 1977
1531 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1978 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1532 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1979 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1533 1980
1544 my ($self) = @_; 1991 my ($self) = @_;
1545 1992
1546 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1993 my $lock = cf::lock_acquire "map_data:$self->{path}";
1547 1994
1548 return if $self->players; 1995 return if $self->players;
1549 return if $self->isa ("ext::map_per_player");#d#
1550 1996
1551 warn "resetting map ", $self->path;#d# 1997 warn "resetting map ", $self->path;
1998
1999 $self->in_memory (cf::MAP_SWAPPED);
2000
2001 # need to save uniques path
2002 unless ($self->{deny_save}) {
2003 my $uniq = $self->uniq_path; utf8::encode $uniq;
2004
2005 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2006 if $uniq;
2007 }
1552 2008
1553 delete $cf::MAP{$self->path}; 2009 delete $cf::MAP{$self->path};
1554 2010
1555 $self->in_memory (cf::MAP_SWAPPED);
1556 $self->clear; 2011 $self->clear;
1557 2012
1558 $_->clear_links_to ($self) for values %cf::MAP; 2013 $_->clear_links_to ($self) for values %cf::MAP;
1559 2014
1560 $self->unlink_save; 2015 $self->unlink_save;
1579 $cf::MAP{$self->path} = $self; 2034 $cf::MAP{$self->path} = $self;
1580 2035
1581 $self->reset; # polite request, might not happen 2036 $self->reset; # polite request, might not happen
1582} 2037}
1583 2038
2039=item $maps = cf::map::tmp_maps
2040
2041Returns an arrayref with all map paths of currently instantiated and saved
2042maps. May block.
2043
2044=cut
2045
2046sub tmp_maps() {
2047 [
2048 map {
2049 utf8::decode $_;
2050 /\.map$/
2051 ? normalise $_
2052 : ()
2053 } @{ aio_readdir $TMPDIR or [] }
2054 ]
2055}
2056
2057=item $maps = cf::map::random_maps
2058
2059Returns an arrayref with all map paths of currently instantiated and saved
2060random maps. May block.
2061
2062=cut
2063
2064sub random_maps() {
2065 [
2066 map {
2067 utf8::decode $_;
2068 /\.map$/
2069 ? normalise "?random/$_"
2070 : ()
2071 } @{ aio_readdir $RANDOMDIR or [] }
2072 ]
2073}
2074
1584=item cf::map::unique_maps 2075=item cf::map::unique_maps
1585 2076
1586Returns an arrayref of paths of all shared maps that have 2077Returns an arrayref of paths of all shared maps that have
1587instantiated unique items. May block. 2078instantiated unique items. May block.
1588 2079
1589=cut 2080=cut
1590 2081
1591sub unique_maps() { 2082sub unique_maps() {
1592 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2083 [
1593 or return; 2084 map {
1594
1595 my @paths;
1596
1597 for (@$files) {
1598 utf8::decode $_; 2085 utf8::decode $_;
1599 next if /\.pst$/;
1600 next unless /^$PATH_SEP/o;
1601
1602 s/\.map$//; 2086 /\.map$/
1603 push @paths, $_; 2087 ? normalise $_
2088 : ()
2089 } @{ aio_readdir $UNIQUEDIR or [] }
1604 } 2090 ]
1605
1606 \@paths
1607} 2091}
1608 2092
1609package cf; 2093package cf;
1610 2094
1611=back 2095=back
1657 2141
1658 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2142 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1659 2143
1660 if ($self->{record_replies}) { 2144 if ($self->{record_replies}) {
1661 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2145 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2146
1662 } else { 2147 } else {
2148 my $pl = $self->contr;
2149
2150 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151 my $diag = $pl->{npc_dialog};
2152 $diag->{pl}->ext_reply (
2153 $diag->{id},
2154 msgtype => "reply",
2155 msg => $diag->{pl}->expand_cfpod ($msg),
2156 add_topics => []
2157 );
2158
2159 } else {
1663 $msg = $npc->name . " says: $msg" if $npc; 2160 $msg = $npc->name . " says: $msg" if $npc;
1664 $self->message ($msg, $flags); 2161 $self->message ($msg, $flags);
2162 }
1665 } 2163 }
1666} 2164}
1667 2165
1668=item $player_object->may ("access") 2166=item $player_object->may ("access")
1669 2167
1702=cut 2200=cut
1703 2201
1704sub link_map { 2202sub link_map {
1705 unless ($LINK_MAP) { 2203 unless ($LINK_MAP) {
1706 $LINK_MAP = cf::map::find "{link}" 2204 $LINK_MAP = cf::map::find "{link}"
1707 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 2205 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1708 $LINK_MAP->load; 2206 $LINK_MAP->load;
1709 } 2207 }
1710 2208
1711 $LINK_MAP 2209 $LINK_MAP
1712} 2210}
1717 $self->deactivate_recursive; 2215 $self->deactivate_recursive;
1718 2216
1719 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2217 return if UNIVERSAL::isa $self->map, "ext::map_link";
1720 2218
1721 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2219 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1722 if $self->map; 2220 if $self->map && $self->map->{path} ne "{link}";
1723 2221
1724 $self->enter_map ($LINK_MAP || link_map, 20, 20); 2222 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1725} 2223}
1726 2224
1727sub cf::object::player::leave_link { 2225sub cf::object::player::leave_link {
1728 my ($self, $map, $x, $y) = @_; 2226 my ($self, $map, $x, $y) = @_;
2227
2228 return unless $self->contr->active;
1729 2229
1730 my $link_pos = delete $self->{_link_pos}; 2230 my $link_pos = delete $self->{_link_pos};
1731 2231
1732 unless ($map) { 2232 unless ($map) {
1733 # restore original map position 2233 # restore original map position
1751 $map->load; 2251 $map->load;
1752 $map->load_diag; 2252 $map->load_diag;
1753 2253
1754 return unless $self->contr->active; 2254 return unless $self->contr->active;
1755 $self->activate_recursive; 2255 $self->activate_recursive;
2256
2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1756 $self->enter_map ($map, $x, $y); 2258 $self->enter_map ($map, $x, $y);
1757} 2259}
1758 2260
1759cf::player->attach ( 2261=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1760 on_logout => sub {
1761 my ($pl) = @_;
1762 2262
1763 # abort map switching before logout 2263Moves the player to the given map-path and coordinates by first freezing
1764 if ($pl->ob->{_link_pos}) { 2264her, loading and preparing them map, calling the provided $check callback
1765 cf::sync_job { 2265that has to return the map if sucecssful, and then unfreezes the player on
1766 $pl->ob->leave_link 2266the new (success) or old (failed) map position. In either case, $done will
1767 }; 2267be called at the end of this process.
1768 }
1769 },
1770 on_login => sub {
1771 my ($pl) = @_;
1772 2268
1773 # try to abort aborted map switching on player login :)
1774 # should happen only on crashes
1775 if ($pl->ob->{_link_pos}) {
1776 $pl->ob->enter_link;
1777 (async {
1778 # we need this sleep as the login has a concurrent enter_exit running
1779 # and this sleep increases chances of the player not ending up in scorn
1780 $pl->ob->reply (undef,
1781 "There was an internal problem at your last logout, "
1782 . "the server will try to bring you to your intended destination in a second.",
1783 cf::NDI_RED);
1784 Coro::Timer::sleep 1;
1785 $pl->ob->leave_link;
1786 })->prio (2);
1787 }
1788 },
1789);
1790
1791=item $player_object->goto ($path, $x, $y)
1792
1793=cut 2269=cut
2270
2271our $GOTOGEN;
1794 2272
1795sub cf::object::player::goto { 2273sub cf::object::player::goto {
1796 my ($self, $path, $x, $y) = @_; 2274 my ($self, $path, $x, $y, $check, $done) = @_;
2275
2276 # do generation counting so two concurrent goto's will be executed in-order
2277 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1797 2278
1798 $self->enter_link; 2279 $self->enter_link;
1799 2280
1800 (async { 2281 (async {
2282 my $map = eval {
1801 my $map = cf::map::find $path; 2283 my $map = cf::map::find $path;
2284
2285 if ($map) {
1802 $map = $map->customise_for ($self) if $map; 2286 $map = $map->customise_for ($self);
1803 2287 $map = $check->($map) if $check && $map;
1804# warn "entering ", $map->path, " at ($x, $y)\n" 2288 } else {
1805# if $map;
1806
1807 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2289 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2290 }
1808 2291
2292 $map
2293 };
2294
2295 if ($@) {
2296 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2297 LOG llevError | logBacktrace, Carp::longmess $@;
2298 }
2299
2300 if ($gen == $self->{_goto_generation}) {
2301 delete $self->{_goto_generation};
1809 $self->leave_link ($map, $x, $y); 2302 $self->leave_link ($map, $x, $y);
2303 }
2304
2305 $done->() if $done;
1810 })->prio (1); 2306 })->prio (1);
1811} 2307}
1812 2308
1813=item $player_object->enter_exit ($exit_object) 2309=item $player_object->enter_exit ($exit_object)
1814 2310
1843 # that depends on the exit object 2339 # that depends on the exit object
1844 2340
1845 my $rmp = parse_random_map_params $exit->msg; 2341 my $rmp = parse_random_map_params $exit->msg;
1846 2342
1847 if ($exit->map) { 2343 if ($exit->map) {
1848 $rmp->{region} = $exit->map->region_name; 2344 $rmp->{region} = $exit->region->name;
1849 $rmp->{origin_map} = $exit->map->path; 2345 $rmp->{origin_map} = $exit->map->path;
1850 $rmp->{origin_x} = $exit->x; 2346 $rmp->{origin_x} = $exit->x;
1851 $rmp->{origin_y} = $exit->y; 2347 $rmp->{origin_y} = $exit->y;
1852 } 2348 }
1853 2349
1854 $rmp->{random_seed} ||= $exit->random_seed; 2350 $rmp->{random_seed} ||= $exit->random_seed;
1855 2351
1856 my $data = cf::to_json $rmp; 2352 my $data = cf::to_json $rmp;
1857 my $md5 = Digest::MD5::md5_hex $data; 2353 my $md5 = Digest::MD5::md5_hex $data;
1858 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2354 my $meta = "$RANDOMDIR/$md5.meta";
1859 2355
1860 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2356 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1861 aio_write $fh, 0, (length $data), $data, 0; 2357 aio_write $fh, 0, (length $data), $data, 0;
1862 undef $fh; 2358 undef $fh;
1863 aio_rename "$meta~", $meta; 2359 aio_rename "$meta~", $meta;
1870sub cf::object::player::enter_exit { 2366sub cf::object::player::enter_exit {
1871 my ($self, $exit) = @_; 2367 my ($self, $exit) = @_;
1872 2368
1873 return unless $self->type == cf::PLAYER; 2369 return unless $self->type == cf::PLAYER;
1874 2370
2371 if ($exit->slaying eq "/!") {
2372 #TODO: this should de-fi-ni-te-ly not be a sync-job
2373 # the problem is that $exit might not survive long enough
2374 # so it needs to be done right now, right here
2375 cf::sync_job { prepare_random_map $exit };
2376 }
2377
2378 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2379 my $hp = $exit->stats->hp;
2380 my $sp = $exit->stats->sp;
2381
1875 $self->enter_link; 2382 $self->enter_link;
2383
2384 # if exit is damned, update players death & WoR home-position
2385 $self->contr->savebed ($slaying, $hp, $sp)
2386 if $exit->flag (FLAG_DAMNED);
1876 2387
1877 (async { 2388 (async {
1878 $self->deactivate_recursive; # just to be sure 2389 $self->deactivate_recursive; # just to be sure
1879 unless (eval { 2390 unless (eval {
1880 prepare_random_map $exit 2391 $self->goto ($slaying, $hp, $sp);
1881 if $exit->slaying eq "/!";
1882
1883 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1884 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1885 2392
1886 1; 2393 1;
1887 }) { 2394 }) {
1888 $self->message ("Something went wrong deep within the crossfire server. " 2395 $self->message ("Something went wrong deep within the crossfire server. "
1889 . "I'll try to bring you back to the map you were before. " 2396 . "I'll try to bring you back to the map you were before. "
1890 . "Please report this to the dungeon master!", 2397 . "Please report this to the dungeon master!",
1891 cf::NDI_UNIQUE | cf::NDI_RED); 2398 cf::NDI_UNIQUE | cf::NDI_RED);
1892 2399
1893 warn "ERROR in enter_exit: $@"; 2400 warn "ERROR in enter_exit: $@";
1894 $self->leave_link; 2401 $self->leave_link;
1895 } 2402 }
1896 })->prio (1); 2403 })->prio (1);
1909 2416
1910sub cf::client::send_drawinfo { 2417sub cf::client::send_drawinfo {
1911 my ($self, $text, $flags) = @_; 2418 my ($self, $text, $flags) = @_;
1912 2419
1913 utf8::encode $text; 2420 utf8::encode $text;
1914 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2421 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1915} 2422}
1916 2423
2424=item $client->send_msg ($color, $type, $msg, [extra...])
2425
2426Send a drawinfo or msg packet to the client, formatting the msg for the
2427client if neccessary. C<$type> should be a string identifying the type of
2428the message, with C<log> being the default. If C<$color> is negative, suppress
2429the message unless the client supports the msg packet.
2430
2431=cut
2432
2433sub cf::client::send_msg {
2434 my ($self, $color, $type, $msg, @extra) = @_;
2435
2436 $msg = $self->pl->expand_cfpod ($msg);
2437
2438 return unless @extra || length $msg;
2439
2440 if ($self->can_msg) {
2441 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));
2442 } else {
2443 # replace some tags by gcfclient-compatible ones
2444 for ($msg) {
2445 1 while
2446 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2447 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2448 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2449 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2450 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2451 }
2452
2453 if ($color >= 0) {
2454 if (0 && $msg =~ /\[/) {
2455 $self->send_packet ("drawextinfo $color 4 0 $msg")
2456 } else {
2457 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2458 $self->send_packet ("drawinfo $color $msg")
2459 }
2460 }
2461 }
2462}
2463
2464=item $client->ext_event ($type, %msg)
2465
2466Sends an ext event to the client.
2467
2468=cut
2469
2470sub cf::client::ext_event($$%) {
2471 my ($self, $type, %msg) = @_;
2472
2473 return unless $self->extcmd;
2474
2475 $msg{msgtype} = "event_$type";
2476 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2477}
1917 2478
1918=item $success = $client->query ($flags, "text", \&cb) 2479=item $success = $client->query ($flags, "text", \&cb)
1919 2480
1920Queues a query to the client, calling the given callback with 2481Queues a query to the client, calling the given callback with
1921the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2482the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
1922C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2483C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
1923 2484
1924Queries can fail, so check the return code. Or don't, as queries will become 2485Queries can fail, so check the return code. Or don't, as queries will
1925reliable at some point in the future. 2486become reliable at some point in the future.
1926 2487
1927=cut 2488=cut
1928 2489
1929sub cf::client::query { 2490sub cf::client::query {
1930 my ($self, $flags, $text, $cb) = @_; 2491 my ($self, $flags, $text, $cb) = @_;
1938 utf8::encode $text; 2499 utf8::encode $text;
1939 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2500 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
1940 2501
1941 $self->send_packet ($self->{query_queue}[0][0]) 2502 $self->send_packet ($self->{query_queue}[0][0])
1942 if @{ $self->{query_queue} } == 1; 2503 if @{ $self->{query_queue} } == 1;
2504
2505 1
1943} 2506}
1944 2507
1945cf::client->attach ( 2508cf::client->attach (
2509 on_connect => sub {
2510 my ($ns) = @_;
2511
2512 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2513 },
1946 on_reply => sub { 2514 on_reply => sub {
1947 my ($ns, $msg) = @_; 2515 my ($ns, $msg) = @_;
1948 2516
1949 # this weird shuffling is so that direct followup queries 2517 # this weird shuffling is so that direct followup queries
1950 # get handled first 2518 # get handled first
1951 my $queue = delete $ns->{query_queue} 2519 my $queue = delete $ns->{query_queue}
1952 or return; # be conservative, not sure how that can happen, but we saw a crash here 2520 or return; # be conservative, not sure how that can happen, but we saw a crash here
1953 2521
1954 (shift @$queue)->[1]->($msg); 2522 (shift @$queue)->[1]->($msg);
2523 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1955 2524
1956 push @{ $ns->{query_queue} }, @$queue; 2525 push @{ $ns->{query_queue} }, @$queue;
1957 2526
1958 if (@{ $ns->{query_queue} } == @$queue) { 2527 if (@{ $ns->{query_queue} } == @$queue) {
1959 if (@$queue) { 2528 if (@$queue) {
1961 } else { 2530 } else {
1962 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2531 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
1963 } 2532 }
1964 } 2533 }
1965 }, 2534 },
2535 on_exticmd => sub {
2536 my ($ns, $buf) = @_;
2537
2538 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2539
2540 if (ref $msg) {
2541 if (my $cb = $EXTICMD{$msg->{msgtype}}) {
2542 if (my %reply = $cb->($ns, $msg)) {
2543 $reply{msgid} = $msg->{msgid};
2544 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2545 }
2546 }
2547 } else {
2548 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2549 }
2550
2551 cf::override;
2552 },
1966); 2553);
1967 2554
1968=item $client->async (\&cb) 2555=item $client->async (\&cb)
1969 2556
1970Create a new coroutine, running the specified callback. The coroutine will 2557Create a new coroutine, running the specified callback. The coroutine will
2017 2604
2018# here we export the classes and methods available to script code 2605# here we export the classes and methods available to script code
2019 2606
2020=pod 2607=pod
2021 2608
2022The following fucntions and emthods are available within a safe environment: 2609The following functions and methods are available within a safe environment:
2023 2610
2024 cf::object contr pay_amount pay_player map 2611 cf::object
2612 contr pay_amount pay_player map x y force_find force_add
2613 insert remove
2614
2025 cf::object::player player 2615 cf::object::player
2026 cf::player peaceful 2616 player
2027 cf::map trigger 2617
2618 cf::player
2619 peaceful
2620
2621 cf::map
2622 trigger
2028 2623
2029=cut 2624=cut
2030 2625
2031for ( 2626for (
2032 ["cf::object" => qw(contr pay_amount pay_player map)], 2627 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2628 insert remove)],
2033 ["cf::object::player" => qw(player)], 2629 ["cf::object::player" => qw(player)],
2034 ["cf::player" => qw(peaceful)], 2630 ["cf::player" => qw(peaceful)],
2035 ["cf::map" => qw(trigger)], 2631 ["cf::map" => qw(trigger)],
2036) { 2632) {
2037 no strict 'refs'; 2633 no strict 'refs';
2108=back 2704=back
2109 2705
2110=cut 2706=cut
2111 2707
2112############################################################################# 2708#############################################################################
2709# the server's init and main functions
2113 2710
2114=head2 EXTENSION DATABASE SUPPORT 2711sub load_facedata($) {
2712 my ($path) = @_;
2115 2713
2116Crossfire maintains a very simple database for extension use. It can 2714 warn "loading facedata from $path\n";
2117currently store anything that can be serialised using Storable, which
2118excludes objects.
2119 2715
2120The parameter C<$family> should best start with the name of the extension 2716 my $facedata;
2121using it, it should be unique. 2717 0 < aio_load $path, $facedata
2718 or die "$path: $!";
2122 2719
2123=over 4 2720 $facedata = Coro::Storable::thaw $facedata;
2124 2721
2125=item $hashref = cf::db_get $family 2722 $facedata->{version} == 2
2723 or cf::cleanup "$path: version mismatch, cannot proceed.";
2126 2724
2127Return a hashref for use by the extension C<$family>, which can be
2128modified. After modifications, you have to call C<cf::db_dirty> or
2129C<cf::db_sync>.
2130
2131=item $value = cf::db_get $family => $key
2132
2133Returns a single value from the database
2134
2135=item cf::db_put $family => $hashref
2136
2137Stores the given family hashref into the database. Updates are delayed, if
2138you want the data to be synced to disk immediately, use C<cf::db_sync>.
2139
2140=item cf::db_put $family => $key => $value
2141
2142Stores the given C<$value> in the family hash. Updates are delayed, if you
2143want the data to be synced to disk immediately, use C<cf::db_sync>.
2144
2145=item cf::db_dirty
2146
2147Marks the database as dirty, to be updated at a later time.
2148
2149=item cf::db_sync
2150
2151Immediately write the database to disk I<if it is dirty>.
2152
2153=cut
2154
2155our $DB;
2156
2157{
2158 my $path = cf::localdir . "/database.pst";
2159
2160 sub db_load() {
2161 $DB = stat $path ? Storable::retrieve $path : { };
2162 } 2725 {
2726 my $faces = $facedata->{faceinfo};
2163 2727
2164 my $pid; 2728 while (my ($face, $info) = each %$faces) {
2729 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2730 cf::face::set_visibility $idx, $info->{visibility};
2731 cf::face::set_magicmap $idx, $info->{magicmap};
2732 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2733 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2165 2734
2166 sub db_save() { 2735 cf::cede_to_tick;
2167 waitpid $pid, 0 if $pid;
2168 if (0 == ($pid = fork)) {
2169 $DB->{_meta}{version} = 1;
2170 Storable::nstore $DB, "$path~";
2171 rename "$path~", $path;
2172 cf::_exit 0 if defined $pid;
2173 }
2174 }
2175
2176 my $dirty;
2177
2178 sub db_sync() {
2179 db_save if $dirty;
2180 undef $dirty;
2181 }
2182
2183 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2184 db_sync;
2185 });
2186
2187 sub db_dirty() {
2188 $dirty = 1;
2189 $idle->start;
2190 }
2191
2192 sub db_get($;$) {
2193 @_ >= 2
2194 ? $DB->{$_[0]}{$_[1]}
2195 : ($DB->{$_[0]} ||= { })
2196 }
2197
2198 sub db_put($$;$) {
2199 if (@_ >= 3) {
2200 $DB->{$_[0]}{$_[1]} = $_[2];
2201 } else {
2202 $DB->{$_[0]} = $_[1];
2203 }
2204 db_dirty;
2205 }
2206
2207 cf::global->attach (
2208 prio => 10000,
2209 on_cleanup => sub {
2210 db_sync;
2211 }, 2736 }
2212 );
2213}
2214 2737
2215############################################################################# 2738 while (my ($face, $info) = each %$faces) {
2216# the server's main() 2739 next unless $info->{smooth};
2740 my $idx = cf::face::find $face
2741 or next;
2742 if (my $smooth = cf::face::find $info->{smooth}) {
2743 cf::face::set_smooth $idx, $smooth;
2744 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2745 } else {
2746 warn "smooth face '$info->{smooth}' not found for face '$face'";
2747 }
2748
2749 cf::cede_to_tick;
2750 }
2751 }
2752
2753 {
2754 my $anims = $facedata->{animinfo};
2755
2756 while (my ($anim, $info) = each %$anims) {
2757 cf::anim::set $anim, $info->{frames}, $info->{facings};
2758 cf::cede_to_tick;
2759 }
2760
2761 cf::anim::invalidate_all; # d'oh
2762 }
2763
2764 {
2765 # TODO: for gcfclient pleasure, we should give resources
2766 # that gcfclient doesn't grok a >10000 face index.
2767 my $res = $facedata->{resource};
2768 my $enc = JSON::XS->new->utf8->canonical;
2769
2770 while (my ($name, $info) = each %$res) {
2771 my $meta = $enc->encode ({
2772 name => $name,
2773 type => $info->{type},
2774 copyright => $info->{copyright}, #TODO#
2775 });
2776
2777 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2778
2779 if ($name =~ /\.jpg$/) {
2780 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack
2781 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack
2782 } else {
2783 my $data = pack "(w/a*)*", $meta, $info->{data};
2784 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2785
2786 cf::face::set_type $idx, 1;
2787 cf::face::set_data $idx, 0, $data, $chk;
2788 }
2789
2790 cf::cede_to_tick;
2791 }
2792 }
2793
2794 1
2795}
2796
2797sub reload_regions {
2798 load_resource_file "$MAPDIR/regions"
2799 or die "unable to load regions file\n";
2800
2801 for (cf::region::list) {
2802 $_->{match} = qr/$_->{match}/
2803 if exists $_->{match};
2804 }
2805}
2806
2807sub reload_facedata {
2808 load_facedata "$DATADIR/facedata"
2809 or die "unable to load facedata\n";
2810}
2811
2812sub reload_archetypes {
2813 load_resource_file "$DATADIR/archetypes"
2814 or die "unable to load archetypes\n";
2815 #d# NEED to laod twice to resolve forward references
2816 # this really needs to be done in an extra post-pass
2817 # (which needs to be synchronous, so solve it differently)
2818 load_resource_file "$DATADIR/archetypes"
2819 or die "unable to load archetypes\n";
2820}
2821
2822sub reload_treasures {
2823 load_resource_file "$DATADIR/treasures"
2824 or die "unable to load treasurelists\n";
2825}
2826
2827sub reload_resources {
2828 warn "reloading resource files...\n";
2829
2830 reload_regions;
2831 reload_facedata;
2832 #reload_archetypes;#d#
2833 reload_archetypes;
2834 reload_treasures;
2835
2836 warn "finished reloading resource files\n";
2837}
2838
2839sub init {
2840 reload_resources;
2841}
2217 2842
2218sub cfg_load { 2843sub cfg_load {
2219 open my $fh, "<:utf8", cf::confdir . "/config" 2844 open my $fh, "<:utf8", "$CONFDIR/config"
2220 or return; 2845 or return;
2221 2846
2222 local $/; 2847 local $/;
2223 *CFG = YAML::Syck::Load <$fh>; 2848 *CFG = YAML::Syck::Load <$fh>;
2224 2849
2244 Event::one_event; 2869 Event::one_event;
2245 })->prio (Coro::PRIO_MAX); 2870 })->prio (Coro::PRIO_MAX);
2246 }; 2871 };
2247 2872
2248 cfg_load; 2873 cfg_load;
2249 db_load; 2874 db_init;
2250 load_extensions; 2875 load_extensions;
2251 2876
2252 $TICK_WATCHER->start; 2877 $TICK_WATCHER->start;
2253 Event::loop; 2878 Event::loop;
2254} 2879}
2258 2883
2259# install some emergency cleanup handlers 2884# install some emergency cleanup handlers
2260BEGIN { 2885BEGIN {
2261 for my $signal (qw(INT HUP TERM)) { 2886 for my $signal (qw(INT HUP TERM)) {
2262 Event->signal ( 2887 Event->signal (
2888 reentrant => 0,
2263 data => WF_AUTOCANCEL, 2889 data => WF_AUTOCANCEL,
2264 signal => $signal, 2890 signal => $signal,
2891 prio => 0,
2265 cb => sub { 2892 cb => sub {
2266 cf::cleanup "SIG$signal"; 2893 cf::cleanup "SIG$signal";
2267 }, 2894 },
2268 ); 2895 );
2269 } 2896 }
2897}
2898
2899sub write_runtime {
2900 my $runtime = "$LOCALDIR/runtime";
2901
2902 # first touch the runtime file to show we are still running:
2903 # the fsync below can take a very very long time.
2904
2905 IO::AIO::aio_utime $runtime, undef, undef;
2906
2907 my $guard = cf::lock_acquire "write_runtime";
2908
2909 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
2910 or return;
2911
2912 my $value = $cf::RUNTIME + 90 + 10;
2913 # 10 is the runtime save interval, for a monotonic clock
2914 # 60 allows for the watchdog to kill the server.
2915
2916 (aio_write $fh, 0, (length $value), $value, 0) <= 0
2917 and return;
2918
2919 # always fsync - this file is important
2920 aio_fsync $fh
2921 and return;
2922
2923 # touch it again to show we are up-to-date
2924 aio_utime $fh, undef, undef;
2925
2926 close $fh
2927 or return;
2928
2929 aio_rename "$runtime~", $runtime
2930 and return;
2931
2932 warn "runtime file written.\n";
2933
2934 1
2270} 2935}
2271 2936
2272sub emergency_save() { 2937sub emergency_save() {
2273 my $freeze_guard = cf::freeze_mainloop; 2938 my $freeze_guard = cf::freeze_mainloop;
2274 2939
2291 my $map = $cf::MAP{$path} or next; 2956 my $map = $cf::MAP{$path} or next;
2292 $map->valid or next; 2957 $map->valid or next;
2293 $map->save; 2958 $map->save;
2294 } 2959 }
2295 warn "end emergency map save\n"; 2960 warn "end emergency map save\n";
2961
2962 warn "begin emergency database checkpoint\n";
2963 BDB::db_env_txn_checkpoint $DB_ENV;
2964 warn "end emergency database checkpoint\n";
2296 }; 2965 };
2297 2966
2298 warn "leave emergency perl save\n"; 2967 warn "leave emergency perl save\n";
2299} 2968}
2300 2969
2970sub post_cleanup {
2971 my ($make_core) = @_;
2972
2973 warn Carp::longmess "post_cleanup backtrace"
2974 if $make_core;
2975}
2976
2301sub reload() { 2977sub do_reload_perl() {
2302 # can/must only be called in main 2978 # can/must only be called in main
2303 if ($Coro::current != $Coro::main) { 2979 if ($Coro::current != $Coro::main) {
2304 warn "can only reload from main coroutine"; 2980 warn "can only reload from main coroutine";
2305 return; 2981 return;
2306 } 2982 }
2307 2983
2308 warn "reloading..."; 2984 warn "reloading...";
2309 2985
2310 warn "cancelling server ticker"; 2986 warn "entering sync_job";
2311 $TICK_WATCHER->cancel;
2312 2987
2988 cf::sync_job {
2989 cf::write_runtime; # external watchdog should not bark
2313 cf::emergency_save; 2990 cf::emergency_save;
2991 cf::write_runtime; # external watchdog should not bark
2314 2992
2315 eval { 2993 warn "syncing database to disk";
2994 BDB::db_env_txn_checkpoint $DB_ENV;
2995
2316 # if anything goes wrong in here, we should simply crash as we already saved 2996 # if anything goes wrong in here, we should simply crash as we already saved
2317
2318 warn "syncing database to disk";
2319 cf::db_sync;
2320 2997
2321 warn "cancelling all WF_AUTOCANCEL watchers"; 2998 warn "cancelling all WF_AUTOCANCEL watchers";
2322 for (Event::all_watchers) { 2999 for (Event::all_watchers) {
2323 $_->cancel if $_->data & WF_AUTOCANCEL; 3000 $_->cancel if $_->data & WF_AUTOCANCEL;
2324 } 3001 }
2325 3002
2326 warn "flushing outstanding aio requests"; 3003 warn "flushing outstanding aio requests";
2327 for (;;) { 3004 for (;;) {
3005 BDB::flush;
2328 IO::AIO::flush; 3006 IO::AIO::flush;
2329 Coro::cede; 3007 Coro::cede;
2330 last unless IO::AIO::nreqs; 3008 last unless IO::AIO::nreqs || BDB::nreqs;
2331 warn "iterate..."; 3009 warn "iterate...";
2332 } 3010 }
3011
3012 ++$RELOAD;
2333 3013
2334 warn "cancelling all extension coros"; 3014 warn "cancelling all extension coros";
2335 $_->cancel for values %EXT_CORO; 3015 $_->cancel for values %EXT_CORO;
2336 %EXT_CORO = (); 3016 %EXT_CORO = ();
2337 3017
2338 warn "removing commands"; 3018 warn "removing commands";
2339 %COMMAND = (); 3019 %COMMAND = ();
2340 3020
2341 warn "removing ext commands"; 3021 warn "removing ext/exti commands";
2342 %EXTCMD = (); 3022 %EXTCMD = ();
3023 %EXTICMD = ();
2343 3024
2344 warn "unloading/nuking all extensions"; 3025 warn "unloading/nuking all extensions";
2345 for my $pkg (@EXTS) { 3026 for my $pkg (@EXTS) {
2346 warn "... unloading $pkg"; 3027 warn "... unloading $pkg";
2347 3028
2377 Symbol::delete_package "safe::$_" 3058 Symbol::delete_package "safe::$_"
2378 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3059 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2379 3060
2380 warn "unloading cf.pm \"a bit\""; 3061 warn "unloading cf.pm \"a bit\"";
2381 delete $INC{"cf.pm"}; 3062 delete $INC{"cf.pm"};
3063 delete $INC{"cf/pod.pm"};
2382 3064
2383 # don't, removes xs symbols, too, 3065 # don't, removes xs symbols, too,
2384 # and global variables created in xs 3066 # and global variables created in xs
2385 #Symbol::delete_package __PACKAGE__; 3067 #Symbol::delete_package __PACKAGE__;
2386 3068
2390 require cf; 3072 require cf;
2391 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3073 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2392 3074
2393 warn "loading config and database again"; 3075 warn "loading config and database again";
2394 cf::cfg_load; 3076 cf::cfg_load;
2395 cf::db_load;
2396 3077
2397 warn "loading extensions"; 3078 warn "loading extensions";
2398 cf::load_extensions; 3079 cf::load_extensions;
2399 3080
2400 warn "reattaching attachments to objects/players"; 3081 warn "reattaching attachments to objects/players";
2401 _global_reattach; 3082 _global_reattach; # objects, sockets
2402 warn "reattaching attachments to maps"; 3083 warn "reattaching attachments to maps";
2403 reattach $_ for values %MAP; 3084 reattach $_ for values %MAP;
3085 warn "reattaching attachments to players";
3086 reattach $_ for values %PLAYER;
2404 3087
2405 warn "restarting server ticker"; 3088 warn "leaving sync_job";
2406 3089
2407 $TICK_WATCHER->start; 3090 1
2408 }; 3091 } or do {
2409
2410 if ($@) {
2411 warn $@; 3092 warn $@;
2412 warn "error while reloading, exiting."; 3093 warn "error while reloading, exiting.";
2413 exit 1; 3094 exit 1;
2414 } 3095 };
2415 3096
2416 warn "reloaded"; 3097 warn "reloaded";
2417}; 3098};
2418 3099
2419our $RELOAD_WATCHER; # used only during reload 3100our $RELOAD_WATCHER; # used only during reload
2420 3101
3102sub reload_perl() {
3103 # doing reload synchronously and two reloads happen back-to-back,
3104 # coro crashes during coro_state_free->destroy here.
3105
3106 $RELOAD_WATCHER ||= Event->timer (
3107 reentrant => 0,
3108 after => 0,
3109 data => WF_AUTOCANCEL,
3110 cb => sub {
3111 do_reload_perl;
3112 undef $RELOAD_WATCHER;
3113 },
3114 );
3115}
3116
2421register_command "reload" => sub { 3117register_command "reload" => sub {
2422 my ($who, $arg) = @_; 3118 my ($who, $arg) = @_;
2423 3119
2424 if ($who->flag (FLAG_WIZ)) { 3120 if ($who->flag (FLAG_WIZ)) {
2425 $who->message ("reloading server."); 3121 $who->message ("reloading server.");
2426 3122 async { reload_perl };
2427 # doing reload synchronously and two reloads happen back-to-back,
2428 # coro crashes during coro_state_free->destroy here.
2429
2430 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub {
2431 reload;
2432 undef $RELOAD_WATCHER;
2433 });
2434 } 3123 }
2435}; 3124};
2436 3125
2437unshift @INC, $LIBDIR; 3126unshift @INC, $LIBDIR;
2438 3127
2439my $bug_warning = 0; 3128my $bug_warning = 0;
2440 3129
3130our @WAIT_FOR_TICK;
3131our @WAIT_FOR_TICK_BEGIN;
3132
3133sub wait_for_tick {
3134 return unless $TICK_WATCHER->is_active;
3135 return if $Coro::current == $Coro::main;
3136
3137 my $signal = new Coro::Signal;
3138 push @WAIT_FOR_TICK, $signal;
3139 $signal->wait;
3140}
3141
3142sub wait_for_tick_begin {
3143 return unless $TICK_WATCHER->is_active;
3144 return if $Coro::current == $Coro::main;
3145
3146 my $signal = new Coro::Signal;
3147 push @WAIT_FOR_TICK_BEGIN, $signal;
3148 $signal->wait;
3149}
3150
3151 my $min = 1e6;#d#
3152 my $avg = 10;
2441$TICK_WATCHER = Event->timer ( 3153$TICK_WATCHER = Event->timer (
2442 reentrant => 0, 3154 reentrant => 0,
2443 parked => 1, 3155 parked => 1,
2444 prio => 0, 3156 prio => 0,
2445 at => $NEXT_TICK || $TICK, 3157 at => $NEXT_TICK || $TICK,
2449 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3161 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2450 unless ++$bug_warning > 10; 3162 unless ++$bug_warning > 10;
2451 return; 3163 return;
2452 } 3164 }
2453 3165
2454 $NOW = Event::time; 3166 $NOW = $tick_start = Event::time;
2455 3167
2456 cf::server_tick; # one server iteration 3168 cf::server_tick; # one server iteration
3169
3170 0 && sync_job {#d#
3171 for(1..10) {
3172 my $t = Event::time;
3173 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3174 or die;
3175
3176 $map->width (50);
3177 $map->height (50);
3178 $map->alloc;
3179 $map->_load_objects ("/tmp/x.map", 1);
3180 my $t = Event::time - $t;
3181
3182 #next unless $t < 0.0013;#d#
3183 if ($t < $min) {
3184 $min = $t;
3185 }
3186 $avg = $avg * 0.99 + $t * 0.01;
3187 }
3188 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3189 exit 0;
3190 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3191 };
3192
2457 $RUNTIME += $TICK; 3193 $RUNTIME += $TICK;
2458 $NEXT_TICK += $TICK; 3194 $NEXT_TICK += $TICK;
2459 3195
2460 $WAIT_FOR_TICK->broadcast; 3196 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2461 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 3197 $NEXT_RUNTIME_WRITE = $NOW + 10;
3198 Coro::async_pool {
3199 write_runtime
3200 or warn "ERROR: unable to write runtime file: $!";
3201 };
3202 }
3203
3204# my $AFTER = Event::time;
3205# warn $AFTER - $NOW;#d#
3206
3207 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3208 $sig->send;
3209 }
3210 while (my $sig = shift @WAIT_FOR_TICK) {
3211 $sig->send;
3212 }
3213
3214 $NOW = Event::time;
2462 3215
2463 # if we are delayed by four ticks or more, skip them all 3216 # if we are delayed by four ticks or more, skip them all
2464 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3217 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2465 3218
2466 $TICK_WATCHER->at ($NEXT_TICK); 3219 $TICK_WATCHER->at ($NEXT_TICK);
2467 $TICK_WATCHER->start; 3220 $TICK_WATCHER->start;
3221
3222 $LOAD = ($NOW - $tick_start) / $TICK;
3223 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3224
3225 _post_tick;
3226
3227
2468 }, 3228 },
2469); 3229);
2470 3230
3231{
3232 BDB::max_poll_time $TICK * 0.1;
3233 $BDB_POLL_WATCHER = Event->io (
3234 reentrant => 0,
3235 fd => BDB::poll_fileno,
3236 poll => 'r',
3237 prio => 0,
3238 data => WF_AUTOCANCEL,
3239 cb => \&BDB::poll_cb,
3240 );
3241 BDB::min_parallel 8;
3242
3243 BDB::set_sync_prepare {
3244 my $status;
3245 my $current = $Coro::current;
3246 (
3247 sub {
3248 $status = $!;
3249 $current->ready; undef $current;
3250 },
3251 sub {
3252 Coro::schedule while defined $current;
3253 $! = $status;
3254 },
3255 )
3256 };
3257
3258 unless ($DB_ENV) {
3259 $DB_ENV = BDB::db_env_create;
3260
3261 cf::sync_job {
3262 eval {
3263 BDB::db_env_open
3264 $DB_ENV,
3265 $BDBDIR,
3266 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3267 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3268 0666;
3269
3270 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3271
3272 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3273 $DB_ENV->set_lk_detect;
3274 };
3275
3276 cf::cleanup "db_env_open(db): $@" if $@;
3277 };
3278 }
3279}
3280
3281{
3282 IO::AIO::min_parallel 8;
3283
3284 undef $Coro::AIO::WATCHER;
2471IO::AIO::max_poll_time $TICK * 0.2; 3285 IO::AIO::max_poll_time $TICK * 0.1;
2472
2473$AIO_POLL_WATCHER = Event->io ( 3286 $AIO_POLL_WATCHER = Event->io (
2474 fd => IO::AIO::poll_fileno, 3287 reentrant => 0,
2475 poll => 'r',
2476 prio => 5,
2477 data => WF_AUTOCANCEL,
2478 cb => \&IO::AIO::poll_cb,
2479);
2480
2481$WRITE_RUNTIME_WATCHER = Event->timer (
2482 data => WF_AUTOCANCEL, 3288 data => WF_AUTOCANCEL,
2483 after => 1, 3289 fd => IO::AIO::poll_fileno,
2484 interval => 10, 3290 poll => 'r',
2485 prio => 6, # keep it lowest so it acts like a watchdog 3291 prio => 6,
2486 cb => Coro::unblock_sub { 3292 cb => \&IO::AIO::poll_cb,
2487 write_runtime 3293 );
2488 or warn "ERROR: unable to write runtime file: $!"; 3294}
3295
3296my $_log_backtrace;
3297
3298sub _log_backtrace {
3299 my ($msg, @addr) = @_;
3300
3301 $msg =~ s/\n//;
3302
3303 # limit the # of concurrent backtraces
3304 if ($_log_backtrace < 2) {
3305 ++$_log_backtrace;
3306 async {
3307 my @bt = fork_call {
3308 @addr = map { sprintf "%x", $_ } @addr;
3309 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3310 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3311 or die "addr2line: $!";
3312
3313 my @funcs;
3314 my @res = <$fh>;
3315 chomp for @res;
3316 while (@res) {
3317 my ($func, $line) = splice @res, 0, 2, ();
3318 push @funcs, "[$func] $line";
3319 }
3320
3321 @funcs
3322 };
3323
3324 LOG llevInfo, "[ABT] $msg\n";
3325 LOG llevInfo, "[ABT] $_\n" for @bt;
3326 --$_log_backtrace;
3327 };
3328 } else {
3329 LOG llevInfo, "[ABT] $msg\n";
3330 LOG llevInfo, "[ABT] [suppressed]\n";
2489 }, 3331 }
2490); 3332}
3333
3334# load additional modules
3335use cf::pod;
2491 3336
2492END { cf::emergency_save } 3337END { cf::emergency_save }
2493 3338
24941 33391
2495 3340

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines