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.330 by elmex, Fri Aug 10 10:35:07 2007 UTC vs.
Revision 1.465 by root, Thu Jan 8 00:54:55 2009 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Storable; 31use EV;
10use Event;
11use Opcode; 32use Opcode;
12use Safe; 33use Safe;
13use Safe::Hole; 34use Safe::Hole;
35use Storable ();
14 36
37use Guard ();
15use Coro 3.61 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
51use Coro::Util ();
24 52
25use JSON::XS 1.4 (); 53use JSON::XS 2.01 ();
26use BDB (); 54use BDB ();
27use Data::Dumper; 55use Data::Dumper;
28use Digest::MD5; 56use Digest::MD5;
29use Fcntl; 57use Fcntl;
30use YAML::Syck (); 58use YAML ();
31use IO::AIO 2.32 (); 59use IO::AIO ();
32use Time::HiRes; 60use Time::HiRes;
33use Compress::LZF; 61use Compress::LZF;
34use Digest::MD5 (); 62use Digest::MD5 ();
63
64AnyEvent::detect;
35 65
36# configure various modules to our taste 66# configure various modules to our taste
37# 67#
38$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
39Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 69Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
70
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72
73# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
40Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
41
42$Event::Eval = 1; # no idea why this is required, but it is
43
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 76
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 78
51our %COMMAND = (); 79our %COMMAND = ();
52our %COMMAND_TIME = (); 80our %COMMAND_TIME = ();
55our %EXTCMD = (); 83our %EXTCMD = ();
56our %EXTICMD = (); 84our %EXTICMD = ();
57our %EXT_CORO = (); # coroutines bound to extensions 85our %EXT_CORO = (); # coroutines bound to extensions
58our %EXT_MAP = (); # pluggable maps 86our %EXT_MAP = (); # pluggable maps
59 87
60our $RELOAD; # number of reloads so far 88our $RELOAD; # number of reloads so far, non-zero while in reload
61our @EVENT; 89our @EVENT;
62 90
63our $CONFDIR = confdir; 91our $CONFDIR = confdir;
64our $DATADIR = datadir; 92our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 93our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 94our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 95our $MAPDIR = "$DATADIR/" . mapdir;
68our $LOCALDIR = localdir; 96our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 97our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 99our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 100our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 101our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime";
104
105our %RESOURCE;
74 106
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 109our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 110our $USE_FSYNC = 1; # use fsync to write maps - default off
82 111
112our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER;
83our $BDB_POLL_WATCHER; 114our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 115our $DB_ENV;
85 116
86our %CFG; 117our %CFG;
87 118
88our $UPTIME; $UPTIME ||= time; 119our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 120our $RUNTIME;
121our $NOW;
90 122
91our %PLAYER; # all users 123our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 124our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 125our $LINK_MAP; # the special {link} map, which is always available
94 126
95# used to convert map paths into valid unix filenames by replacing / by ∕ 127# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 128our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 129
98our $LOAD; # a number between 0 (idle) and 1 (too many objects) 130our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing 131our $LOADAVG; # same thing, but with alpha-smoothing
132our $JITTER; # average jitter
100our $tick_start; # for load detecting purposes 133our $TICK_START; # for load detecting purposes
134
135our @POST_INIT;
136
137our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
101 138
102binmode STDOUT; 139binmode STDOUT;
103binmode STDERR; 140binmode STDERR;
104 141
105# read virtual server time, if available 142# read virtual server time, if available
106unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 143unless ($RUNTIME || !-e $RUNTIMEFILE) {
107 open my $fh, "<", "$LOCALDIR/runtime" 144 open my $fh, "<", $RUNTIMEFILE
108 or die "unable to read runtime file: $!"; 145 or die "unable to read $RUNTIMEFILE file: $!";
109 $RUNTIME = <$fh> + 0.; 146 $RUNTIME = <$fh> + 0.;
110} 147}
111 148
112mkdir $_ 149mkdir $_
113 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
158 195
159The raw value load value from the last tick. 196The raw value load value from the last tick.
160 197
161=item %cf::CFG 198=item %cf::CFG
162 199
163Configuration for the server, loaded from C</etc/crossfire/config>, or 200Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 201from wherever your confdir points to.
165 202
166=item cf::wait_for_tick, cf::wait_for_tick_begin 203=item cf::wait_for_tick, cf::wait_for_tick_begin
167 204
168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 205These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
186 $msg .= "\n" 223 $msg .= "\n"
187 unless $msg =~ /\n$/; 224 unless $msg =~ /\n$/;
188 225
189 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 226 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190 227
191 utf8::encode $msg;
192 LOG llevError, $msg; 228 LOG llevError, $msg;
193 }; 229 };
194} 230}
231
232$Coro::State::DIEHOOK = sub {
233 return unless $^S eq 0; # "eq", not "=="
234
235 if ($Coro::current == $Coro::main) {#d#
236 warn "DIEHOOK called in main context, Coro bug?\n";#d#
237 return;#d#
238 }#d#
239
240 # kill coroutine otherwise
241 warn Carp::longmess $_[0];
242 Coro::terminate
243};
244
245$SIG{__DIE__} = sub { }; #d#?
195 246
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 247@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 248@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 249@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 250@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
206for my $pkg (qw( 257for my $pkg (qw(
207 cf::global cf::attachable 258 cf::global cf::attachable
208 cf::object cf::object::player 259 cf::object cf::object::player
209 cf::client cf::player 260 cf::client cf::player
210 cf::arch cf::living 261 cf::arch cf::living
262 cf::map cf::mapspace
211 cf::map cf::party cf::region 263 cf::party cf::region
212)) { 264)) {
213 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 265 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 266}
216 267
217$Event::DIED = sub { 268$EV::DIED = sub {
218 warn "error in event callback: @_"; 269 warn "error in event callback: @_";
219}; 270};
220 271
221############################################################################# 272#############################################################################
222 273
245 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 296 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
246 $d 297 $d
247 } || "[unable to dump $_[0]: '$@']"; 298 } || "[unable to dump $_[0]: '$@']";
248} 299}
249 300
250=item $ref = cf::from_json $json 301=item $ref = cf::decode_json $json
251 302
252Converts a JSON string into the corresponding perl data structure. 303Converts a JSON string into the corresponding perl data structure.
253 304
254=item $json = cf::to_json $ref 305=item $json = cf::encode_json $ref
255 306
256Converts a perl data structure into its JSON representation. 307Converts a perl data structure into its JSON representation.
257 308
258=cut 309=cut
259 310
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 311our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261 312
262sub to_json ($) { $json_coder->encode ($_[0]) } 313sub encode_json($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) } 314sub decode_json($) { $json_coder->decode ($_[0]) }
315
316=item cf::post_init { BLOCK }
317
318Execute the given codeblock, I<after> all extensions have been (re-)loaded,
319but I<before> the server starts ticking again.
320
321The cdoeblock will have a single boolean argument to indicate whether this
322is a reload or not.
323
324=cut
325
326sub post_init(&) {
327 push @POST_INIT, shift;
328}
264 329
265=item cf::lock_wait $string 330=item cf::lock_wait $string
266 331
267Wait until the given lock is available. See cf::lock_acquire. 332Wait until the given lock is available. See cf::lock_acquire.
268 333
269=item my $lock = cf::lock_acquire $string 334=item my $lock = cf::lock_acquire $string
270 335
271Wait until the given lock is available and then acquires it and returns 336Wait until the given lock is available and then acquires it and returns
272a Coro::guard object. If the guard object gets destroyed (goes out of scope, 337a L<Guard> object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 338for example when the coroutine gets canceled), the lock is automatically
274returned. 339returned.
275 340
341Locks are *not* recursive, locking from the same coro twice results in a
342deadlocked coro.
343
276Lock names should begin with a unique identifier (for example, cf::map::find 344Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 345uses map_find and cf::map::load uses map_load).
278 346
279=item $locked = cf::lock_active $string 347=item $locked = cf::lock_active $string
280 348
281Return true if the lock is currently active, i.e. somebody has locked it. 349Return true if the lock is currently active, i.e. somebody has locked it.
282 350
283=cut 351=cut
284 352
285our %LOCK; 353our $LOCKS = new Coro::SemaphoreSet;
286 354
287sub lock_wait($) { 355sub lock_wait($) {
288 my ($key) = @_; 356 $LOCKS->wait ($_[0]);
289
290 # wait for lock, if any
291 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule;
294 }
295} 357}
296 358
297sub lock_acquire($) { 359sub lock_acquire($) {
298 my ($key) = @_; 360 $LOCKS->guard ($_[0])
299
300 # wait, to be sure we are not locked
301 lock_wait $key;
302
303 $LOCK{$key} = [];
304
305 Coro::guard {
306 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} };
308 }
309} 361}
310 362
311sub lock_active($) { 363sub lock_active($) {
312 my ($key) = @_; 364 $LOCKS->count ($_[0]) < 1
313
314 ! ! $LOCK{$key}
315} 365}
316 366
317sub freeze_mainloop { 367sub freeze_mainloop {
318 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
319 369
320 my $guard = Coro::guard { 370 &Guard::guard (\&tick_inhibit_dec);
321 $TICK_WATCHER->start; 371}
322 }; 372
323 $TICK_WATCHER->stop; 373=item cf::periodic $interval, $cb
324 $guard 374
375Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer.
377
378=cut
379
380sub periodic($$) {
381 my ($interval, $cb) = @_;
382
383 my $start = rand List::Util::min 180, $interval;
384
385 EV::periodic $start, $interval, 0, $cb
325} 386}
326 387
327=item cf::get_slot $time[, $priority[, $name]] 388=item cf::get_slot $time[, $priority[, $name]]
328 389
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 390Allocate $time seconds of blocking CPU time at priority C<$priority>:
340our @SLOT_QUEUE; 401our @SLOT_QUEUE;
341our $SLOT_QUEUE; 402our $SLOT_QUEUE;
342 403
343$SLOT_QUEUE->cancel if $SLOT_QUEUE; 404$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344$SLOT_QUEUE = Coro::async { 405$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager");
407
345 my $signal = new Coro::Signal; 408 my $signal = new Coro::Signal;
346 409
347 while () { 410 while () {
348 next_job: 411 next_job:
349 my $avail = cf::till_tick; 412 my $avail = cf::till_tick;
357 } 420 }
358 } 421 }
359 } 422 }
360 423
361 if (@SLOT_QUEUE) { 424 if (@SLOT_QUEUE) {
362 # we do not use wait_For_tick() as it returns immediately when tick is inactive 425 # we do not use wait_for_tick() as it returns immediately when tick is inactive
363 push @cf::WAIT_FOR_TICK, $signal; 426 push @cf::WAIT_FOR_TICK, $signal;
364 $signal->wait; 427 $signal->wait;
365 } else { 428 } else {
366 Coro::schedule; 429 Coro::schedule;
367 } 430 }
368 } 431 }
369}; 432};
370 433
371sub get_slot($;$$) { 434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
372 my ($time, $pri, $name) = @_; 437 my ($time, $pri, $name) = @_;
373 438
374 $time = $TICK * .6 if $time > $TICK * .6; 439 $time = $TICK * .6 if $time > $TICK * .6;
375 my $sig = new Coro::Signal; 440 my $sig = new Coro::Signal;
376 441
390 455
391BEGIN { *async = \&Coro::async_pool } 456BEGIN { *async = \&Coro::async_pool }
392 457
393=item cf::sync_job { BLOCK } 458=item cf::sync_job { BLOCK }
394 459
395The design of Crossfire TRT requires that the main coroutine ($Coro::main) 460The design of Deliantra requires that the main coroutine ($Coro::main)
396is always able to handle events or runnable, as Crossfire TRT is only 461is always able to handle events or runnable, as Deliantra is only
397partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 462partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
398acceptable. 463acceptable.
399 464
400If it must be done, put the blocking parts into C<sync_job>. This will run 465If it must be done, put the blocking parts into C<sync_job>. This will run
401the given BLOCK in another coroutine while waiting for the result. The 466the given BLOCK in another coroutine while waiting for the result. The
406 471
407sub sync_job(&) { 472sub sync_job(&) {
408 my ($job) = @_; 473 my ($job) = @_;
409 474
410 if ($Coro::current == $Coro::main) { 475 if ($Coro::current == $Coro::main) {
411 my $time = Event::time; 476 my $time = EV::time;
412 477
413 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
414 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
415 480
416 # TODO: use suspend/resume instead 481 LOG llevError, Carp::longmess "sync job";#d#
417 # (but this is cancel-safe) 482
418 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
419 484
420 my $busy = 1; 485 my $busy = 1;
421 my @res; 486 my @res;
422 487
423 (async { 488 (async {
489 $Coro::current->desc ("sync job coro");
424 @res = eval { $job->() }; 490 @res = eval { $job->() };
425 warn $@ if $@; 491 warn $@ if $@;
426 undef $busy; 492 undef $busy;
427 })->prio (Coro::PRIO_MAX); 493 })->prio (Coro::PRIO_MAX);
428 494
429 while ($busy) { 495 while ($busy) {
430 Coro::cede or Event::one_event; 496 if (Coro::nready) {
497 Coro::cede_notself;
498 } else {
499 EV::loop EV::LOOP_ONESHOT;
431 } 500 }
501 }
432 502
433 $time = Event::time - $time; 503 my $time = EV::time - $time;
434 504
435 LOG llevError | logBacktrace, Carp::longmess "long sync job"
436 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
437
438 $tick_start += $time; # do not account sync jobs to server load 505 $TICK_START += $time; # do not account sync jobs to server load
439 506
440 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
441 } else { 508 } else {
442 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
443 510
468=item fork_call { }, $args 535=item fork_call { }, $args
469 536
470Executes the given code block with the given arguments in a seperate 537Executes the given code block with the given arguments in a seperate
471process, returning the results. Everything must be serialisable with 538process, returning the results. Everything must be serialisable with
472Coro::Storable. May, of course, block. Note that the executed sub may 539Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 540never block itself or use any form of event handling.
474 541
475=cut 542=cut
476
477sub _store_scalar {
478 open my $fh, ">", \my $buf
479 or die "fork_call: cannot open fh-to-buf in child : $!";
480 Storable::store_fd $_[0], $fh;
481 close $fh;
482
483 $buf
484}
485 543
486sub fork_call(&@) { 544sub fork_call(&@) {
487 my ($cb, @args) = @_; 545 my ($cb, @args) = @_;
488 546
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 547 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 548 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 549 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 550
494 if (my $pid = fork) { 551 my @res = Coro::Util::fork_eval {
495 close $fh2;
496
497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
499 $res = Coro::Storable::thaw $res;
500
501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503 Carp::confess $$res unless "ARRAY" eq ref $res;
504
505 return wantarray ? @$res : $res->[-1];
506 } else {
507 reset_signals; 552 reset_signals;
508 local $SIG{__WARN__}; 553 &$cb
509 local $SIG{__DIE__}; 554 }, @args;
510 # just in case, this hack effectively disables event
511 # in the child. cleaner and slower would be canceling all watchers,
512 # but this works for the time being.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515 555
516 eval { 556 wantarray ? @res : $res[-1]
517 close $fh1; 557}
518 558
519 my @res = eval { $cb->(@args) }; 559=item $coin = coin_from_name $name
520 560
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 561=cut
522 close $fh2;
523 };
524 562
525 warn $@ if $@; 563our %coin_alias = (
526 _exit 0; 564 "silver" => "silvercoin",
527 } 565 "silvercoin" => "silvercoin",
566 "silvercoins" => "silvercoin",
567 "gold" => "goldcoin",
568 "goldcoin" => "goldcoin",
569 "goldcoins" => "goldcoin",
570 "platinum" => "platinacoin",
571 "platinumcoin" => "platinacoin",
572 "platinumcoins" => "platinacoin",
573 "platina" => "platinacoin",
574 "platinacoin" => "platinacoin",
575 "platinacoins" => "platinacoin",
576 "royalty" => "royalty",
577 "royalties" => "royalty",
578);
579
580sub coin_from_name($) {
581 $coin_alias{$_[0]}
582 ? cf::arch::find $coin_alias{$_[0]}
583 : undef
528} 584}
529 585
530=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
531 587
532Returns a single value from the environment database. 588Returns a single value from the environment database.
534=item cf::db_put $family => $key => $value 590=item cf::db_put $family => $key => $value
535 591
536Stores the given C<$value> in the family. It can currently store binary 592Stores the given C<$value> in the family. It can currently store binary
537data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 593data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
538 594
595=item $db = cf::db_table "name"
596
597Create and/or open a new database table. The string must not be "db" and must be unique
598within each server.
599
539=cut 600=cut
601
602sub db_table($) {
603 my ($name) = @_;
604 my $db = BDB::db_create $DB_ENV;
605
606 eval {
607 $db->set_flags (BDB::CHKSUM);
608
609 utf8::encode $name;
610 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
611 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
612 cf::cleanup "db_open(db): $!" if $!;
613 };
614 cf::cleanup "db_open(db): $@" if $@;
615
616 $db
617}
540 618
541our $DB; 619our $DB;
542 620
543sub db_init { 621sub db_init {
544 unless ($DB) {
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job { 622 cf::sync_job {
548 eval { 623 $DB ||= db_table "db";
549 $DB->set_flags (BDB::CHKSUM);
550
551 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
552 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
553 cf::cleanup "db_open(db): $!" if $!;
554 };
555 cf::cleanup "db_open(db): $@" if $@;
556 };
557 } 624 };
558} 625}
559 626
560sub db_get($$) { 627sub db_get($$) {
561 my $key = "$_[0]/$_[1]"; 628 my $key = "$_[0]/$_[1]";
562 629
612 if (1) { 679 if (1) {
613 $md5 = 680 $md5 =
614 join "\x00", 681 join "\x00",
615 $processversion, 682 $processversion,
616 map { 683 map {
617 Coro::cede; 684 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 685 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 686 } 0.. $#$src;
620 687
621 688
622 my $dbmd5 = db_get cache => "$id/md5"; 689 my $dbmd5 = db_get cache => "$id/md5";
660 727
661############################################################################# 728#############################################################################
662 729
663=head2 ATTACHABLE OBJECTS 730=head2 ATTACHABLE OBJECTS
664 731
665Many objects in crossfire are so-called attachable objects. That means you can 732Many objects in deliantra are so-called attachable objects. That means you can
666attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
667to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
668 735
669In the following description, CLASS can be any of C<global>, C<object> 736In the following description, CLASS can be any of C<global>, C<object>
670C<player>, C<client> or C<map> (i.e. the attachable objects in 737C<player>, C<client> or C<map> (i.e. the attachable objects in
671Crossfire TRT). 738Deliantra).
672 739
673=over 4 740=over 4
674 741
675=item $attachable->attach ($attachment, key => $value...) 742=item $attachable->attach ($attachment, key => $value...)
676 743
720=item cf::CLASS::attachment $name, ... 787=item cf::CLASS::attachment $name, ...
721 788
722Register an attachment by C<$name> through which attachable objects of the 789Register an attachment by C<$name> through which attachable objects of the
723given CLASS can refer to this attachment. 790given CLASS can refer to this attachment.
724 791
725Some classes such as crossfire maps and objects can specify attachments 792Some classes such as deliantra maps and objects can specify attachments
726that are attached at load/instantiate time, thus the need for a name. 793that are attached at load/instantiate time, thus the need for a name.
727 794
728These calls expect any number of the following handler/hook descriptions: 795These calls expect any number of the following handler/hook descriptions:
729 796
730=over 4 797=over 4
958 } 1025 }
959 1026
960 0 1027 0
961} 1028}
962 1029
963=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
964 1031
965=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
966 1033
967Generate an object-specific event with the given arguments. 1034Generate an object-specific event with the given arguments.
968 1035
974 1041
975=cut 1042=cut
976 1043
977############################################################################# 1044#############################################################################
978# object support 1045# object support
979#
980 1046
1047sub _object_equal($$);
1048sub _object_equal($$) {
1049 my ($a, $b) = @_;
1050
1051 return 0 unless (ref $a) eq (ref $b);
1052
1053 if ("HASH" eq ref $a) {
1054 my @ka = keys %$a;
1055 my @kb = keys %$b;
1056
1057 return 0 if @ka != @kb;
1058
1059 for (0 .. $#ka) {
1060 return 0 unless $ka[$_] eq $kb[$_];
1061 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1062 }
1063
1064 } elsif ("ARRAY" eq ref $a) {
1065
1066 return 0 if @$a != @$b;
1067
1068 for (0 .. $#$a) {
1069 return 0 unless _object_equal $a->[$_], $b->[$_];
1070 }
1071
1072 } elsif ($a ne $b) {
1073 return 0;
1074 }
1075
1076 1
1077}
1078
1079our $SLOW_MERGES;#d#
981sub _can_merge { 1080sub _can_merge {
982 my ($ob1, $ob2) = @_; 1081 my ($ob1, $ob2) = @_;
983 1082
984 local $Storable::canonical = 1; 1083 ++$SLOW_MERGES;#d#
985 my $fob1 = Storable::freeze $ob1;
986 my $fob2 = Storable::freeze $ob2;
987 1084
988 $fob1 eq $fob2 1085 # we do the slow way here
1086 return _object_equal $ob1, $ob2
989} 1087}
990 1088
991sub reattach { 1089sub reattach {
992 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
993 my ($obj) = @_; 1091 my ($obj) = @_;
994 1092
1093 # no longer needed after getting rid of delete_package?
995 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1094 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
996 1095
997 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
998 1097
999 @$registry = (); 1098 @$registry = ();
1000 1099
1015cf::attachable->attach ( 1114cf::attachable->attach (
1016 prio => -1000000, 1115 prio => -1000000,
1017 on_instantiate => sub { 1116 on_instantiate => sub {
1018 my ($obj, $data) = @_; 1117 my ($obj, $data) = @_;
1019 1118
1020 $data = from_json $data; 1119 $data = decode_json $data;
1021 1120
1022 for (@$data) { 1121 for (@$data) {
1023 my ($name, $args) = @$_; 1122 my ($name, $args) = @$_;
1024 1123
1025 $obj->attach ($name, %{$args || {} }); 1124 $obj->attach ($name, %{$args || {} });
1041sub object_freezer_save { 1140sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1141 my ($filename, $rdata, $objs) = @_;
1043 1142
1044 sync_job { 1143 sync_job {
1045 if (length $$rdata) { 1144 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
1048 1148
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
1053 close $fh; 1153 aio_close $fh;
1054 1154
1055 if (@$objs) { 1155 if (@$objs) {
1056 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1057 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
1058 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1059 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
1060 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
1061 close $fh; 1161 aio_close $fh;
1062 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
1063 } 1163 }
1064 } else { 1164 } else {
1065 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1066 } 1166 }
1067 1167
1068 aio_rename "$filename~", $filename; 1168 aio_rename "$filename~", $filename;
1169
1170 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC;
1069 } else { 1172 } else {
1070 warn "FATAL: $filename~: $!\n"; 1173 warn "unable to save objects: $filename~: $!\n";
1071 } 1174 }
1072 } else { 1175 } else {
1073 aio_unlink $filename; 1176 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1177 aio_unlink "$filename.pst";
1075 } 1178 }
1076 } 1179 };
1077} 1180}
1078 1181
1079sub object_freezer_as_string { 1182sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1183 my ($rdata, $objs) = @_;
1081 1184
1093 or return; 1196 or return;
1094 1197
1095 unless (aio_stat "$filename.pst") { 1198 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1199 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1200 or return;
1201
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1202 my $st = eval { Coro::Storable::thaw $av };
1203 $av = $st->{objs};
1099 } 1204 }
1100 1205
1206 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1207 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1208 $decname, length $data, scalar @{$av || []};
1209
1103 return ($data, $av); 1210 ($data, $av)
1104} 1211}
1105 1212
1106=head2 COMMAND CALLBACKS 1213=head2 COMMAND CALLBACKS
1107 1214
1108=over 4 1215=over 4
1162 my ($name, $cb) = @_; 1269 my ($name, $cb) = @_;
1163 1270
1164 $EXTICMD{$name} = $cb; 1271 $EXTICMD{$name} = $cb;
1165} 1272}
1166 1273
1274use File::Glob ();
1275
1167cf::player->attach ( 1276cf::player->attach (
1168 on_command => sub { 1277 on_command => sub {
1169 my ($pl, $name, $params) = @_; 1278 my ($pl, $name, $params) = @_;
1170 1279
1171 my $cb = $COMMAND{$name} 1280 my $cb = $COMMAND{$name}
1186 my ($type, $reply, @payload) = 1295 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1296 "ARRAY" eq ref $msg
1188 ? @$msg 1297 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1298 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1299
1300 my @reply;
1301
1191 if (my $cb = $EXTCMD{$type}) { 1302 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1303 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1304 }
1305
1306 $pl->ext_reply ($reply, @reply)
1307 if $reply;
1308
1197 } else { 1309 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1310 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1311 }
1200 1312
1201 cf::override; 1313 cf::override;
1202 }, 1314 },
1203); 1315);
1316
1317# "readahead" all extensions
1318sub cache_extensions {
1319 my $grp = IO::AIO::aio_group;
1320
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1322 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 }
1325 };
1326
1327 $grp
1328}
1204 1329
1205sub load_extensions { 1330sub load_extensions {
1206 cf::sync_job { 1331 cf::sync_job {
1207 my %todo; 1332 my %todo;
1208 1333
1228 1353
1229 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1354 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1230 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1355 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1231 1356
1232 $ext{source} = 1357 $ext{source} =
1233 "package $pkg; use strict; use utf8;\n" 1358 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1234 . "#line 1 \"$path\"\n{\n" 1359 . "#line 1 \"$path\"\n{\n"
1235 . $source 1360 . $source
1236 . "\n};\n1"; 1361 . "\n};\n1";
1237 1362
1238 $todo{$base} = \%ext; 1363 $todo{$base} = \%ext;
1254 my $msg = $@ ? "$v->{path}: $@\n" 1379 my $msg = $@ ? "$v->{path}: $@\n"
1255 : "$v->{base}: extension inactive.\n"; 1380 : "$v->{base}: extension inactive.\n";
1256 1381
1257 if (exists $v->{meta}{mandatory}) { 1382 if (exists $v->{meta}{mandatory}) {
1258 warn $msg; 1383 warn $msg;
1259 warn "mandatory extension failed to load, exiting.\n"; 1384 cf::cleanup "mandatory extension failed to load, exiting.";
1260 exit 1;
1261 } 1385 }
1262 1386
1263 warn $msg; 1387 warn $msg;
1264 } 1388 }
1265 1389
1279 1403
1280=back 1404=back
1281 1405
1282=head2 CORE EXTENSIONS 1406=head2 CORE EXTENSIONS
1283 1407
1284Functions and methods that extend core crossfire objects. 1408Functions and methods that extend core deliantra objects.
1285 1409
1286=cut 1410=cut
1287 1411
1288package cf::player; 1412package cf::player;
1289 1413
1290use Coro::AIO; 1414use Coro::AIO;
1291 1415
1292=head3 cf::player 1416=head3 cf::player
1293 1417
1294=over 4 1418=over 4
1419
1420=item cf::player::num_playing
1421
1422Returns the official number of playing players, as per the Crossfire metaserver rules.
1423
1424=cut
1425
1426sub num_playing {
1427 scalar grep
1428 $_->ob->map
1429 && !$_->hidden
1430 && !$_->ob->flag (cf::FLAG_WIZ),
1431 cf::player::list
1432}
1295 1433
1296=item cf::player::find $login 1434=item cf::player::find $login
1297 1435
1298Returns the given player object, loading it if necessary (might block). 1436Returns the given player object, loading it if necessary (might block).
1299 1437
1318 1456
1319sub exists($) { 1457sub exists($) {
1320 my ($login) = @_; 1458 my ($login) = @_;
1321 1459
1322 $cf::PLAYER{$login} 1460 $cf::PLAYER{$login}
1323 or cf::sync_job { !aio_stat path $login } 1461 or !aio_stat path $login
1324} 1462}
1325 1463
1326sub find($) { 1464sub find($) {
1327 return $cf::PLAYER{$_[0]} || do { 1465 return $cf::PLAYER{$_[0]} || do {
1328 my $login = $_[0]; 1466 my $login = $_[0];
1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1473 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1474 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1475 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1476 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1477
1340 my $pl = load_pl path $login 1478 my $f = new_from_file cf::object::thawer path $login
1341 or return; 1479 or return;
1480
1481 my $pl = cf::player::load_pl $f
1482 or return;
1483
1484 local $cf::PLAYER_LOADING{$login} = $pl;
1485 $f->resolve_delayed_derefs;
1342 $cf::PLAYER{$login} = $pl 1486 $cf::PLAYER{$login} = $pl
1343 } 1487 }
1344 } 1488 }
1345} 1489}
1346 1490
1355 return if $pl->{deny_save}; 1499 return if $pl->{deny_save};
1356 1500
1357 aio_mkdir playerdir $pl, 0770; 1501 aio_mkdir playerdir $pl, 0770;
1358 $pl->{last_save} = $cf::RUNTIME; 1502 $pl->{last_save} = $cf::RUNTIME;
1359 1503
1504 cf::get_slot 0.01;
1505
1360 $pl->save_pl ($path); 1506 $pl->save_pl ($path);
1361 Coro::cede; 1507 cf::cede_to_tick;
1362} 1508}
1363 1509
1364sub new($) { 1510sub new($) {
1365 my ($login) = @_; 1511 my ($login) = @_;
1366 1512
1395 my ($pl) = @_; 1541 my ($pl) = @_;
1396 1542
1397 my $name = $pl->ob->name; 1543 my $name = $pl->ob->name;
1398 1544
1399 $pl->{deny_save} = 1; 1545 $pl->{deny_save} = 1;
1400 $pl->password ("*"); # this should lock out the player until we nuked the dir 1546 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1401 1547
1402 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1548 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1403 $pl->deactivate; 1549 $pl->deactivate;
1550 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1551 $pl->ob->check_score;
1404 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1552 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1405 $pl->ns->destroy if $pl->ns; 1553 $pl->ns->destroy if $pl->ns;
1406 1554
1407 my $path = playerdir $pl; 1555 my $path = playerdir $pl;
1408 my $temp = "$path~$cf::RUNTIME~deleting~"; 1556 my $temp = "$path~$cf::RUNTIME~deleting~";
1444 or return []; 1592 or return [];
1445 1593
1446 my @logins; 1594 my @logins;
1447 1595
1448 for my $login (@$dirs) { 1596 for my $login (@$dirs) {
1597 my $path = path $login;
1598
1599 # a .pst is a dead give-away for a valid player
1600 # if no pst file found, open and chekc for blocked users
1601 if (aio_stat "$path.pst") {
1449 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1602 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1450 aio_read $fh, 0, 512, my $buf, 0 or next; 1603 aio_read $fh, 0, 512, my $buf, 0 or next;
1451 $buf !~ /^password -------------$/m or next; # official not-valid tag 1604 $buf !~ /^password -------------$/m or next; # official not-valid tag
1605 }
1452 1606
1453 utf8::decode $login; 1607 utf8::decode $login;
1454 push @logins, $login; 1608 push @logins, $login;
1455 } 1609 }
1456 1610
1483 } 1637 }
1484 1638
1485 \@paths 1639 \@paths
1486} 1640}
1487 1641
1488=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1642=item $protocol_xml = $player->expand_cfpod ($cfpod)
1489 1643
1490Expand crossfire pod fragments into protocol xml. 1644Expand deliantra pod fragments into protocol xml.
1491
1492=cut
1493
1494sub expand_cfpod {
1495 ((my $self), (local $_)) = @_;
1496
1497 # escape & and <
1498 s/&/&amp;/g;
1499 s/(?<![BIUGH])</&lt;/g;
1500
1501 # this is buggy, it needs to properly take care of nested <'s
1502
1503 1 while
1504 # replace B<>, I<>, U<> etc.
1505 s/B<([^\>]*)>/<b>$1<\/b>/
1506 || s/I<([^\>]*)>/<i>$1<\/i>/
1507 || s/U<([^\>]*)>/<u>$1<\/u>/
1508 # replace G<male|female> tags
1509 || s{G<([^>|]*)\|([^>]*)>}{
1510 $self->gender ? $2 : $1
1511 }ge
1512 # replace H<hint text>
1513 || s{H<([^\>]*)>}
1514 {
1515 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1516 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1517 "")
1518 [$self->{hintmode}]
1519 }ge;
1520
1521 # create single paragraphs (very hackish)
1522 s/(?<=\S)\n(?=\w)/ /g;
1523
1524 # compress some whitespace
1525 s/\s+\n/\n/g; # ws line-ends
1526 s/\n\n+/\n/g; # double lines
1527 s/^\n+//; # beginning lines
1528 s/\n+$//; # ending lines
1529
1530 $_
1531}
1532
1533sub hintmode {
1534 $_[0]{hintmode} = $_[1] if @_ > 1;
1535 $_[0]{hintmode}
1536}
1537 1645
1538=item $player->ext_reply ($msgid, @msg) 1646=item $player->ext_reply ($msgid, @msg)
1539 1647
1540Sends an ext reply to the player. 1648Sends an ext reply to the player.
1541 1649
1542=cut 1650=cut
1543 1651
1544sub ext_reply($$@) { 1652sub ext_reply($$@) {
1545 my ($self, $id, @msg) = @_; 1653 my ($self, $id, @msg) = @_;
1546 1654
1547 if ($self->ns->extcmd == 2) { 1655 $self->ns->ext_reply ($id, @msg)
1548 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1549 } elsif ($self->ns->extcmd == 1) {
1550 #TODO: version 1, remove
1551 unshift @msg, msgtype => "reply", msgid => $id;
1552 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1553 }
1554} 1656}
1555 1657
1556=item $player->ext_msg ($type, @msg) 1658=item $player->ext_msg ($type, @msg)
1557 1659
1558Sends an ext event to the client. 1660Sends an ext event to the client.
1614our $MAX_RESET = 3600; 1716our $MAX_RESET = 3600;
1615our $DEFAULT_RESET = 3000; 1717our $DEFAULT_RESET = 3000;
1616 1718
1617sub generate_random_map { 1719sub generate_random_map {
1618 my ($self, $rmp) = @_; 1720 my ($self, $rmp) = @_;
1721
1722 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1723
1619 # mit "rum" bekleckern, nicht 1724 # mit "rum" bekleckern, nicht
1620 $self->_create_random_map ( 1725 $self->_create_random_map (
1621 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1726 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1622 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1727 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1623 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1728 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1745 1850
1746# the temporary/swap location 1851# the temporary/swap location
1747sub save_path { 1852sub save_path {
1748 my ($self) = @_; 1853 my ($self) = @_;
1749 1854
1750 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1855 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1751 "$TMPDIR/$path.map" 1856 "$TMPDIR/$path.map"
1752} 1857}
1753 1858
1754# the unique path, undef == no special unique path 1859# the unique path, undef == no special unique path
1755sub uniq_path { 1860sub uniq_path {
1756 my ($self) = @_; 1861 my ($self) = @_;
1757 1862
1758 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1759 "$UNIQUEDIR/$path" 1864 "$UNIQUEDIR/$path"
1760}
1761
1762# and all this just because we cannot iterate over
1763# all maps in C++...
1764sub change_all_map_light {
1765 my ($change) = @_;
1766
1767 $_->change_map_light ($change)
1768 for grep $_->outdoor, values %cf::MAP;
1769} 1865}
1770 1866
1771sub decay_objects { 1867sub decay_objects {
1772 my ($self) = @_; 1868 my ($self) = @_;
1773 1869
1786 1882
1787sub load_header_from($) { 1883sub load_header_from($) {
1788 my ($self, $path) = @_; 1884 my ($self, $path) = @_;
1789 1885
1790 utf8::encode $path; 1886 utf8::encode $path;
1791 #aio_open $path, O_RDONLY, 0 1887 my $f = new_from_file cf::object::thawer $path
1792 # or return;
1793
1794 $self->_load_header ($path)
1795 or return; 1888 or return;
1889
1890 $self->_load_header ($f)
1891 or return;
1892
1893 local $MAP_LOADING{$self->{path}} = $self;
1894 $f->resolve_delayed_derefs;
1796 1895
1797 $self->{load_path} = $path; 1896 $self->{load_path} = $path;
1798 1897
1799 1 1898 1
1800} 1899}
1854sub find { 1953sub find {
1855 my ($path, $origin) = @_; 1954 my ($path, $origin) = @_;
1856 1955
1857 $path = normalise $path, $origin && $origin->path; 1956 $path = normalise $path, $origin && $origin->path;
1858 1957
1958 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1859 cf::lock_wait "map_find:$path"; 1959 my $guard2 = cf::lock_acquire "map_find:$path";
1860 1960
1861 $cf::MAP{$path} || do { 1961 $cf::MAP{$path} || do {
1862 my $guard = cf::lock_acquire "map_find:$path";
1863 my $map = new_from_path cf::map $path 1962 my $map = new_from_path cf::map $path
1864 or return; 1963 or return;
1865 1964
1866 $map->{last_save} = $cf::RUNTIME; 1965 $map->{last_save} = $cf::RUNTIME;
1867 1966
1869 or return; 1968 or return;
1870 1969
1871 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1970 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1872 # doing this can freeze the server in a sync job, obviously 1971 # doing this can freeze the server in a sync job, obviously
1873 #$cf::WAIT_FOR_TICK->wait; 1972 #$cf::WAIT_FOR_TICK->wait;
1973 undef $guard2;
1974 undef $guard1;
1874 $map->reset; 1975 $map->reset;
1875 undef $guard;
1876 return find $path; 1976 return find $path;
1877 } 1977 }
1878 1978
1879 $cf::MAP{$path} = $map 1979 $cf::MAP{$path} = $map
1880 } 1980 }
1889 local $self->{deny_reset} = 1; # loading can take a long time 1989 local $self->{deny_reset} = 1; # loading can take a long time
1890 1990
1891 my $path = $self->{path}; 1991 my $path = $self->{path};
1892 1992
1893 { 1993 {
1894 my $guard = cf::lock_acquire "map_load:$path"; 1994 my $guard = cf::lock_acquire "map_data:$path";
1895 1995
1996 return unless $self->valid;
1896 return if $self->in_memory != cf::MAP_SWAPPED; 1997 return unless $self->in_memory == cf::MAP_SWAPPED;
1897 1998
1898 $self->in_memory (cf::MAP_LOADING); 1999 $self->in_memory (cf::MAP_LOADING);
1899 2000
1900 $self->alloc; 2001 $self->alloc;
1901 2002
1902 $self->pre_load; 2003 $self->pre_load;
1903 Coro::cede; 2004 cf::cede_to_tick;
1904 2005
2006 my $f = new_from_file cf::object::thawer $self->{load_path};
2007 $f->skip_block;
1905 $self->_load_objects ($self->{load_path}, 1) 2008 $self->_load_objects ($f)
1906 or return; 2009 or return;
1907 2010
1908 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2011 $self->post_load_original
1909 if delete $self->{load_original}; 2012 if delete $self->{load_original};
1910 2013
1911 if (my $uniq = $self->uniq_path) { 2014 if (my $uniq = $self->uniq_path) {
1912 utf8::encode $uniq; 2015 utf8::encode $uniq;
1913 if (aio_open $uniq, O_RDONLY, 0) { 2016 unless (aio_stat $uniq) {
2017 if (my $f = new_from_file cf::object::thawer $uniq) {
1914 $self->clear_unique_items; 2018 $self->clear_unique_items;
1915 $self->_load_objects ($uniq, 0); 2019 $self->_load_objects ($f);
2020 $f->resolve_delayed_derefs;
2021 }
1916 } 2022 }
1917 } 2023 }
1918 2024
1919 Coro::cede; 2025 $f->resolve_delayed_derefs;
2026
2027 cf::cede_to_tick;
1920 # now do the right thing for maps 2028 # now do the right thing for maps
1921 $self->link_multipart_objects; 2029 $self->link_multipart_objects;
1922 $self->difficulty ($self->estimate_difficulty) 2030 $self->difficulty ($self->estimate_difficulty)
1923 unless $self->difficulty; 2031 unless $self->difficulty;
1924 Coro::cede; 2032 cf::cede_to_tick;
1925 2033
1926 unless ($self->{deny_activate}) { 2034 unless ($self->{deny_activate}) {
1927 $self->decay_objects; 2035 $self->decay_objects;
1928 $self->fix_auto_apply; 2036 $self->fix_auto_apply;
1929 $self->update_buttons; 2037 $self->update_buttons;
1930 Coro::cede; 2038 cf::cede_to_tick;
1931 $self->set_darkness_map;
1932 Coro::cede;
1933 $self->activate; 2039 $self->activate;
1934 } 2040 }
1935 2041
1936 $self->{last_save} = $cf::RUNTIME; 2042 $self->{last_save} = $cf::RUNTIME;
1937 $self->last_access ($cf::RUNTIME); 2043 $self->last_access ($cf::RUNTIME);
1938 2044
1939 $self->in_memory (cf::MAP_IN_MEMORY); 2045 $self->in_memory (cf::MAP_ACTIVE);
1940 } 2046 }
1941 2047
1942 $self->post_load; 2048 $self->post_load;
1943} 2049}
1944 2050
1953 2059
1954 $self 2060 $self
1955} 2061}
1956 2062
1957# find and load all maps in the 3x3 area around a map 2063# find and load all maps in the 3x3 area around a map
1958sub load_diag { 2064sub load_neighbours {
1959 my ($map) = @_; 2065 my ($map) = @_;
1960 2066
1961 my @diag; # diagonal neighbours 2067 my @neigh; # diagonal neighbours
1962 2068
1963 for (0 .. 3) { 2069 for (0 .. 3) {
1964 my $neigh = $map->tile_path ($_) 2070 my $neigh = $map->tile_path ($_)
1965 or next; 2071 or next;
1966 $neigh = find $neigh, $map 2072 $neigh = find $neigh, $map
1967 or next; 2073 or next;
1968 $neigh->load; 2074 $neigh->load;
1969 2075
2076 push @neigh,
1970 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2077 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1971 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2078 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1972 } 2079 }
1973 2080
1974 for (@diag) { 2081 for (grep defined $_->[0], @neigh) {
2082 my ($path, $origin) = @$_;
1975 my $neigh = find @$_ 2083 my $neigh = find $path, $origin
1976 or next; 2084 or next;
1977 $neigh->load; 2085 $neigh->load;
1978 } 2086 }
1979} 2087}
1980 2088
1985} 2093}
1986 2094
1987sub do_load_sync { 2095sub do_load_sync {
1988 my ($map) = @_; 2096 my ($map) = @_;
1989 2097
2098 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2099 if $Coro::current == $Coro::main;
2100
1990 cf::sync_job { $map->load }; 2101 cf::sync_job { $map->load };
1991} 2102}
1992 2103
1993our %MAP_PREFETCH; 2104our %MAP_PREFETCH;
1994our $MAP_PREFETCHER = undef; 2105our $MAP_PREFETCHER = undef;
1995 2106
1996sub find_async { 2107sub find_async {
1997 my ($path, $origin) = @_; 2108 my ($path, $origin, $load) = @_;
1998 2109
1999 $path = normalise $path, $origin && $origin->{path}; 2110 $path = normalise $path, $origin && $origin->{path};
2000 2111
2001 if (my $map = $cf::MAP{$path}) { 2112 if (my $map = $cf::MAP{$path}) {
2002 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2113 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2003 } 2114 }
2004 2115
2005 undef $MAP_PREFETCH{$path}; 2116 $MAP_PREFETCH{$path} |= $load;
2117
2006 $MAP_PREFETCHER ||= cf::async { 2118 $MAP_PREFETCHER ||= cf::async {
2119 $Coro::current->{desc} = "map prefetcher";
2120
2007 while (%MAP_PREFETCH) { 2121 while (%MAP_PREFETCH) {
2008 for my $path (keys %MAP_PREFETCH) { 2122 while (my ($k, $v) = each %MAP_PREFETCH) {
2009 if (my $map = find $path) { 2123 if (my $map = find $k) {
2010 $map->load; 2124 $map->load if $v;
2011 } 2125 }
2012 2126
2013 delete $MAP_PREFETCH{$path}; 2127 delete $MAP_PREFETCH{$k};
2014 } 2128 }
2015 } 2129 }
2016 undef $MAP_PREFETCHER; 2130 undef $MAP_PREFETCHER;
2017 }; 2131 };
2018 $MAP_PREFETCHER->prio (6); 2132 $MAP_PREFETCHER->prio (6);
2021} 2135}
2022 2136
2023sub save { 2137sub save {
2024 my ($self) = @_; 2138 my ($self) = @_;
2025 2139
2026 my $lock = cf::lock_acquire "map_data:" . $self->path; 2140 my $lock = cf::lock_acquire "map_data:$self->{path}";
2027 2141
2028 $self->{last_save} = $cf::RUNTIME; 2142 $self->{last_save} = $cf::RUNTIME;
2029 2143
2030 return unless $self->dirty; 2144 return unless $self->dirty;
2031 2145
2037 return if $self->{deny_save}; 2151 return if $self->{deny_save};
2038 2152
2039 local $self->{last_access} = $self->last_access;#d# 2153 local $self->{last_access} = $self->last_access;#d#
2040 2154
2041 cf::async { 2155 cf::async {
2156 $Coro::current->{desc} = "map player save";
2042 $_->contr->save for $self->players; 2157 $_->contr->save for $self->players;
2043 }; 2158 };
2159
2160 cf::get_slot 0.02;
2044 2161
2045 if ($uniq) { 2162 if ($uniq) {
2046 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2163 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2047 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2164 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2048 } else { 2165 } else {
2054 my ($self) = @_; 2171 my ($self) = @_;
2055 2172
2056 # save first because save cedes 2173 # save first because save cedes
2057 $self->save; 2174 $self->save;
2058 2175
2059 my $lock = cf::lock_acquire "map_data:" . $self->path; 2176 my $lock = cf::lock_acquire "map_data:$self->{path}";
2060 2177
2061 return if $self->players; 2178 return if $self->players;
2062 return if $self->in_memory != cf::MAP_IN_MEMORY; 2179 return if $self->in_memory != cf::MAP_ACTIVE;
2063 return if $self->{deny_save}; 2180 return if $self->{deny_save};
2064 2181
2182 $self->in_memory (cf::MAP_SWAPPED);
2183
2184 $self->deactivate;
2185 $_->clear_links_to ($self) for values %cf::MAP;
2065 $self->clear; 2186 $self->clear;
2066 $self->in_memory (cf::MAP_SWAPPED);
2067} 2187}
2068 2188
2069sub reset_at { 2189sub reset_at {
2070 my ($self) = @_; 2190 my ($self) = @_;
2071 2191
2103 if $uniq; 2223 if $uniq;
2104 } 2224 }
2105 2225
2106 delete $cf::MAP{$self->path}; 2226 delete $cf::MAP{$self->path};
2107 2227
2228 $self->deactivate;
2229 $_->clear_links_to ($self) for values %cf::MAP;
2108 $self->clear; 2230 $self->clear;
2109
2110 $_->clear_links_to ($self) for values %cf::MAP;
2111 2231
2112 $self->unlink_save; 2232 $self->unlink_save;
2113 $self->destroy; 2233 $self->destroy;
2114} 2234}
2115 2235
2116my $nuke_counter = "aaaa"; 2236my $nuke_counter = "aaaa";
2117 2237
2118sub nuke { 2238sub nuke {
2119 my ($self) = @_; 2239 my ($self) = @_;
2120 2240
2241 {
2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2243
2121 delete $cf::MAP{$self->path}; 2244 delete $cf::MAP{$self->path};
2122 2245
2123 $self->unlink_save; 2246 $self->unlink_save;
2124 2247
2125 bless $self, "cf::map"; 2248 bless $self, "cf::map";
2126 delete $self->{deny_reset}; 2249 delete $self->{deny_reset};
2127 $self->{deny_save} = 1; 2250 $self->{deny_save} = 1;
2128 $self->reset_timeout (1); 2251 $self->reset_timeout (1);
2129 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2252 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2130 2253
2131 $cf::MAP{$self->path} = $self; 2254 $cf::MAP{$self->path} = $self;
2255 }
2132 2256
2133 $self->reset; # polite request, might not happen 2257 $self->reset; # polite request, might not happen
2134} 2258}
2135 2259
2136=item $maps = cf::map::tmp_maps 2260=item $maps = cf::map::tmp_maps
2178 2302
2179sub unique_maps() { 2303sub unique_maps() {
2180 [ 2304 [
2181 map { 2305 map {
2182 utf8::decode $_; 2306 utf8::decode $_;
2183 /\.map$/ 2307 s/\.map$//; # TODO future compatibility hack
2308 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2309 ? ()
2184 ? normalise $_ 2310 : normalise $_
2185 : ()
2186 } @{ aio_readdir $UNIQUEDIR or [] } 2311 } @{ aio_readdir $UNIQUEDIR or [] }
2187 ] 2312 ]
2188} 2313}
2189 2314
2190package cf;
2191
2192=back 2315=back
2193 2316
2194=head3 cf::object 2317=head3 cf::object
2195 2318
2196=cut 2319=cut
2199 2322
2200=over 4 2323=over 4
2201 2324
2202=item $ob->inv_recursive 2325=item $ob->inv_recursive
2203 2326
2204Returns the inventory of the object _and_ their inventories, recursively. 2327Returns the inventory of the object I<and> their inventories, recursively,
2328but I<not> the object itself.
2205 2329
2206=cut 2330=cut
2207 2331
2208sub inv_recursive_; 2332sub inv_recursive_;
2209sub inv_recursive_ { 2333sub inv_recursive_ {
2212 2336
2213sub inv_recursive { 2337sub inv_recursive {
2214 inv_recursive_ inv $_[0] 2338 inv_recursive_ inv $_[0]
2215} 2339}
2216 2340
2341=item $ref = $ob->ref
2342
2343Creates and returns a persistent reference to an object that can be stored as a string.
2344
2345=item $ob = cf::object::deref ($refstring)
2346
2347returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2348even if the object actually exists. May block.
2349
2350=cut
2351
2352sub deref {
2353 my ($ref) = @_;
2354
2355 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2356 my ($uuid, $name) = ($1, $2);
2357 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2358 or return;
2359 $pl->ob->uuid eq $uuid
2360 or return;
2361
2362 $pl->ob
2363 } else {
2364 warn "$ref: cannot resolve object reference\n";
2365 undef
2366 }
2367}
2368
2217package cf; 2369package cf;
2218 2370
2219=back 2371=back
2220 2372
2221=head3 cf::object::player 2373=head3 cf::object::player
2227Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2379Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2228can be C<undef>. Does the right thing when the player is currently in a 2380can be C<undef>. Does the right thing when the player is currently in a
2229dialogue with the given NPC character. 2381dialogue with the given NPC character.
2230 2382
2231=cut 2383=cut
2384
2385our $SAY_CHANNEL = {
2386 id => "say",
2387 title => "Map",
2388 reply => "say ",
2389 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2390};
2391
2392our $CHAT_CHANNEL = {
2393 id => "chat",
2394 title => "Chat",
2395 reply => "chat ",
2396 tooltip => "Player chat and shouts, global to the server.",
2397};
2232 2398
2233# rough implementation of a future "reply" method that works 2399# rough implementation of a future "reply" method that works
2234# with dialog boxes. 2400# with dialog boxes.
2235#TODO: the first argument must go, split into a $npc->reply_to ( method 2401#TODO: the first argument must go, split into a $npc->reply_to ( method
2236sub cf::object::player::reply($$$;$) { 2402sub cf::object::player::reply($$$;$) {
2248 my $dialog = $pl->{npc_dialog}; 2414 my $dialog = $pl->{npc_dialog};
2249 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2415 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2250 2416
2251 } else { 2417 } else {
2252 $msg = $npc->name . " says: $msg" if $npc; 2418 $msg = $npc->name . " says: $msg" if $npc;
2253 $self->message ($msg, $flags); 2419 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2254 } 2420 }
2255 } 2421 }
2256} 2422}
2257 2423
2258=item $object->send_msg ($channel, $msg, $color, [extra...]) 2424=item $object->send_msg ($channel, $msg, $color, [extra...])
2283 2449
2284=item $player_object->enter_link 2450=item $player_object->enter_link
2285 2451
2286Freezes the player and moves him/her to a special map (C<{link}>). 2452Freezes the player and moves him/her to a special map (C<{link}>).
2287 2453
2288The player should be reasonably safe there for short amounts of time. You 2454The player should be reasonably safe there for short amounts of time (e.g.
2289I<MUST> call C<leave_link> as soon as possible, though. 2455for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2456though, as the palyer cannot control the character while it is on the link
2457map.
2290 2458
2291Will never block. 2459Will never block.
2292 2460
2293=item $player_object->leave_link ($map, $x, $y) 2461=item $player_object->leave_link ($map, $x, $y)
2294 2462
2349 # use -1 or undef as default coordinates, not 0, 0 2517 # use -1 or undef as default coordinates, not 0, 0
2350 ($x, $y) = ($map->enter_x, $map->enter_y) 2518 ($x, $y) = ($map->enter_x, $map->enter_y)
2351 if $x <=0 && $y <= 0; 2519 if $x <=0 && $y <= 0;
2352 2520
2353 $map->load; 2521 $map->load;
2354 $map->load_diag; 2522 $map->load_neighbours;
2355 2523
2356 return unless $self->contr->active; 2524 return unless $self->contr->active;
2525 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2357 $self->activate_recursive; 2526 $self->activate_recursive;
2358 2527
2359 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2360 $self->enter_map ($map, $x, $y); 2529 $self->enter_map ($map, $x, $y);
2361} 2530}
2366her, loading and preparing them map, calling the provided $check callback 2535her, loading and preparing them map, calling the provided $check callback
2367that has to return the map if sucecssful, and then unfreezes the player on 2536that has to return the map if sucecssful, and then unfreezes the player on
2368the new (success) or old (failed) map position. In either case, $done will 2537the new (success) or old (failed) map position. In either case, $done will
2369be called at the end of this process. 2538be called at the end of this process.
2370 2539
2540Note that $check will be called with a potentially non-loaded map, so if
2541it needs a loaded map it has to call C<< ->load >>.
2542
2371=cut 2543=cut
2372 2544
2373our $GOTOGEN; 2545our $GOTOGEN;
2374 2546
2375sub cf::object::player::goto { 2547sub cf::object::player::goto {
2379 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2551 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2380 2552
2381 $self->enter_link; 2553 $self->enter_link;
2382 2554
2383 (async { 2555 (async {
2556 $Coro::current->{desc} = "player::goto $path $x $y";
2557
2558 # *tag paths override both path and x|y
2559 if ($path =~ /^\*(.*)$/) {
2560 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2561 my $ob = $obs[rand @obs];
2562
2563 # see if we actually can go there
2564 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2565 $ob = $obs[rand @obs];
2566 } else {
2567 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2568 }
2569 # else put us there anyways for now #d#
2570
2571 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2572 } else {
2573 ($path, $x, $y) = (undef, undef, undef);
2574 }
2575 }
2576
2384 my $map = eval { 2577 my $map = eval {
2385 my $map = cf::map::find $path; 2578 my $map = defined $path ? cf::map::find $path : undef;
2386 2579
2387 if ($map) { 2580 if ($map) {
2388 $map = $map->customise_for ($self); 2581 $map = $map->customise_for ($self);
2389 $map = $check->($map) if $check && $map; 2582 $map = $check->($map) if $check && $map;
2390 } else { 2583 } else {
2391 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2584 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2392 } 2585 }
2393 2586
2394 $map 2587 $map
2395 }; 2588 };
2396 2589
2432} 2625}
2433 2626
2434sub prepare_random_map { 2627sub prepare_random_map {
2435 my ($exit) = @_; 2628 my ($exit) = @_;
2436 2629
2437 my $guard = cf::lock_acquire "exit_prepare:$exit";
2438
2439 # all this does is basically replace the /! path by 2630 # all this does is basically replace the /! path by
2440 # a new random map path (?random/...) with a seed 2631 # a new random map path (?random/...) with a seed
2441 # that depends on the exit object 2632 # that depends on the exit object
2442 2633
2443 my $rmp = parse_random_map_params $exit->msg; 2634 my $rmp = parse_random_map_params $exit->msg;
2445 if ($exit->map) { 2636 if ($exit->map) {
2446 $rmp->{region} = $exit->region->name; 2637 $rmp->{region} = $exit->region->name;
2447 $rmp->{origin_map} = $exit->map->path; 2638 $rmp->{origin_map} = $exit->map->path;
2448 $rmp->{origin_x} = $exit->x; 2639 $rmp->{origin_x} = $exit->x;
2449 $rmp->{origin_y} = $exit->y; 2640 $rmp->{origin_y} = $exit->y;
2641
2642 $exit->map->touch;
2450 } 2643 }
2451 2644
2452 $rmp->{random_seed} ||= $exit->random_seed; 2645 $rmp->{random_seed} ||= $exit->random_seed;
2453 2646
2454 my $data = cf::to_json $rmp; 2647 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2455 my $md5 = Digest::MD5::md5_hex $data; 2648 my $md5 = Digest::MD5::md5_hex $data;
2456 my $meta = "$RANDOMDIR/$md5.meta"; 2649 my $meta = "$RANDOMDIR/$md5.meta";
2457 2650
2458 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2459 aio_write $fh, 0, (length $data), $data, 0; 2652 aio_write $fh, 0, (length $data), $data, 0;
2460 undef $fh; 2653 undef $fh;
2461 aio_rename "$meta~", $meta; 2654 aio_rename "$meta~", $meta;
2462 2655
2656 my $slaying = "?random/$md5";
2657
2658 if ($exit->valid) {
2463 $exit->slaying ("?random/$md5"); 2659 $exit->slaying ("?random/$md5");
2464 $exit->msg (undef); 2660 $exit->msg (undef);
2661 }
2465 } 2662 }
2466} 2663}
2467 2664
2468sub cf::object::player::enter_exit { 2665sub cf::object::player::enter_exit {
2469 my ($self, $exit) = @_; 2666 my ($self, $exit) = @_;
2470 2667
2471 return unless $self->type == cf::PLAYER; 2668 return unless $self->type == cf::PLAYER;
2472 2669
2473 if ($exit->slaying eq "/!") {
2474 #TODO: this should de-fi-ni-te-ly not be a sync-job
2475 # the problem is that $exit might not survive long enough
2476 # so it needs to be done right now, right here
2477 cf::sync_job { prepare_random_map $exit };
2478 }
2479
2480 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2481 my $hp = $exit->stats->hp;
2482 my $sp = $exit->stats->sp;
2483
2484 $self->enter_link; 2670 $self->enter_link;
2485 2671
2486 # if exit is damned, update players death & WoR home-position
2487 $self->contr->savebed ($slaying, $hp, $sp)
2488 if $exit->flag (FLAG_DAMNED);
2489
2490 (async { 2672 (async {
2491 $self->deactivate_recursive; # just to be sure 2673 $Coro::current->{desc} = "enter_exit";
2674
2492 unless (eval { 2675 unless (eval {
2676 $self->deactivate_recursive; # just to be sure
2677
2678 # random map handling
2679 {
2680 my $guard = cf::lock_acquire "exit_prepare:$exit";
2681
2682 prepare_random_map $exit
2683 if $exit->slaying eq "/!";
2684 }
2685
2686 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2687 my $x = $exit->stats->hp;
2688 my $y = $exit->stats->sp;
2689
2493 $self->goto ($slaying, $hp, $sp); 2690 $self->goto ($map, $x, $y);
2494 2691
2692 # if exit is damned, update players death & WoR home-position
2693 $self->contr->savebed ($map, $x, $y)
2694 if $exit->flag (cf::FLAG_DAMNED);
2695
2495 1; 2696 1
2496 }) { 2697 }) {
2497 $self->message ("Something went wrong deep within the crossfire server. " 2698 $self->message ("Something went wrong deep within the deliantra server. "
2498 . "I'll try to bring you back to the map you were before. " 2699 . "I'll try to bring you back to the map you were before. "
2499 . "Please report this to the dungeon master!", 2700 . "Please report this to the dungeon master!",
2500 cf::NDI_UNIQUE | cf::NDI_RED); 2701 cf::NDI_UNIQUE | cf::NDI_RED);
2501 2702
2502 warn "ERROR in enter_exit: $@"; 2703 warn "ERROR in enter_exit: $@";
2530the message, with C<log> being the default. If C<$color> is negative, suppress 2731the message, with C<log> being the default. If C<$color> is negative, suppress
2531the message unless the client supports the msg packet. 2732the message unless the client supports the msg packet.
2532 2733
2533=cut 2734=cut
2534 2735
2736# non-persistent channels (usually the info channel)
2737our %CHANNEL = (
2738 "c/identify" => {
2739 id => "infobox",
2740 title => "Identify",
2741 reply => undef,
2742 tooltip => "Items recently identified",
2743 },
2744 "c/examine" => {
2745 id => "infobox",
2746 title => "Examine",
2747 reply => undef,
2748 tooltip => "Signs and other items you examined",
2749 },
2750 "c/book" => {
2751 id => "infobox",
2752 title => "Book",
2753 reply => undef,
2754 tooltip => "The contents of a note or book",
2755 },
2756 "c/lookat" => {
2757 id => "infobox",
2758 title => "Look",
2759 reply => undef,
2760 tooltip => "What you saw there",
2761 },
2762 "c/who" => {
2763 id => "infobox",
2764 title => "Players",
2765 reply => undef,
2766 tooltip => "Shows players who are currently online",
2767 },
2768 "c/body" => {
2769 id => "infobox",
2770 title => "Body Parts",
2771 reply => undef,
2772 tooltip => "Shows which body parts you posess and are available",
2773 },
2774 "c/statistics" => {
2775 id => "infobox",
2776 title => "Statistics",
2777 reply => undef,
2778 tooltip => "Shows your primary statistics",
2779 },
2780 "c/skills" => {
2781 id => "infobox",
2782 title => "Skills",
2783 reply => undef,
2784 tooltip => "Shows your experience per skill and item power",
2785 },
2786 "c/resistances" => {
2787 id => "infobox",
2788 title => "Resistances",
2789 reply => undef,
2790 tooltip => "Shows your resistances",
2791 },
2792 "c/pets" => {
2793 id => "infobox",
2794 title => "Pets",
2795 reply => undef,
2796 tooltip => "Shows information abotu your pets/a specific pet",
2797 },
2798 "c/uptime" => {
2799 id => "infobox",
2800 title => "Uptime",
2801 reply => undef,
2802 tooltip => "How long the server has been running since last restart",
2803 },
2804 "c/mapinfo" => {
2805 id => "infobox",
2806 title => "Map Info",
2807 reply => undef,
2808 tooltip => "Information related to the maps",
2809 },
2810 "c/party" => {
2811 id => "party",
2812 title => "Party",
2813 reply => "gsay ",
2814 tooltip => "Messages and chat related to your party",
2815 },
2816 "c/death" => {
2817 id => "death",
2818 title => "Death",
2819 reply => undef,
2820 tooltip => "Reason for and more info about your most recent death",
2821 },
2822 "c/say" => $SAY_CHANNEL,
2823 "c/chat" => $CHAT_CHANNEL,
2824);
2825
2535sub cf::client::send_msg { 2826sub cf::client::send_msg {
2536 my ($self, $channel, $msg, $color, @extra) = @_; 2827 my ($self, $channel, $msg, $color, @extra) = @_;
2537 2828
2538 $msg = $self->pl->expand_cfpod ($msg); 2829 $msg = $self->pl->expand_cfpod ($msg)
2830 unless $color & cf::NDI_VERBATIM;
2539 2831
2540 $color &= cf::NDI_CLIENT_MASK; # just in case... 2832 $color &= cf::NDI_CLIENT_MASK; # just in case...
2541 2833
2834 # check predefined channels, for the benefit of C
2835 if ($CHANNEL{$channel}) {
2836 $channel = $CHANNEL{$channel};
2837
2838 $self->ext_msg (channel_info => $channel);
2839 $channel = $channel->{id};
2840
2542 if (ref $channel) { 2841 } elsif (ref $channel) {
2543 # send meta info to client, if not yet sent 2842 # send meta info to client, if not yet sent
2544 unless (exists $self->{channel}{$channel->{id}}) { 2843 unless (exists $self->{channel}{$channel->{id}}) {
2545 $self->{channel}{$channel->{id}} = $channel; 2844 $self->{channel}{$channel->{id}} = $channel;
2546 $self->ext_msg (channel_info => $channel); 2845 $self->ext_msg (channel_info => $channel);
2547 } 2846 }
2549 $channel = $channel->{id}; 2848 $channel = $channel->{id};
2550 } 2849 }
2551 2850
2552 return unless @extra || length $msg; 2851 return unless @extra || length $msg;
2553 2852
2554 if ($self->can_msg) {
2555 # default colour, mask it out 2853 # default colour, mask it out
2556 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2854 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2557 if $color & cf::NDI_DEF; 2855 if $color & cf::NDI_DEF;
2558 2856
2559 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2857 my $pkt = "msg "
2858 . $self->{json_coder}->encode (
2560 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2859 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2561 } else { 2860 );
2562 if ($color >= 0) {
2563 # replace some tags by gcfclient-compatible ones
2564 for ($msg) {
2565 1 while
2566 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2567 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2568 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2569 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2570 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2571 }
2572 2861
2573 $color &= cf::NDI_COLOR_MASK; 2862 # try lzf for large packets
2863 $pkt = "lzf " . Compress::LZF::compress $pkt
2864 if 1024 <= length $pkt and $self->{can_lzf};
2574 2865
2575 utf8::encode $msg; 2866 # split very large packets
2576 2867 if (8192 < length $pkt and $self->{can_lzf}) {
2577 if (0 && $msg =~ /\[/) { 2868 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2578 $self->send_packet ("drawextinfo $color 4 0 $msg") 2869 $pkt = "frag";
2579 } else {
2580 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2581 $self->send_packet ("drawinfo $color $msg")
2582 }
2583 }
2584 } 2870 }
2871
2872 $self->send_packet ($pkt);
2585} 2873}
2586 2874
2587=item $client->ext_msg ($type, @msg) 2875=item $client->ext_msg ($type, @msg)
2588 2876
2589Sends an ext event to the client. 2877Sends an ext event to the client.
2591=cut 2879=cut
2592 2880
2593sub cf::client::ext_msg($$@) { 2881sub cf::client::ext_msg($$@) {
2594 my ($self, $type, @msg) = @_; 2882 my ($self, $type, @msg) = @_;
2595 2883
2596 my $extcmd = $self->extcmd;
2597
2598 if ($extcmd == 2) { 2884 if ($self->extcmd == 2) {
2599 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2885 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2600 } elsif ($extcmd == 1) { # TODO: remove 2886 } elsif ($self->extcmd == 1) { # TODO: remove
2601 push @msg, msgtype => "event_$type"; 2887 push @msg, msgtype => "event_$type";
2888 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2889 }
2890}
2891
2892=item $client->ext_reply ($msgid, @msg)
2893
2894Sends an ext reply to the client.
2895
2896=cut
2897
2898sub cf::client::ext_reply($$@) {
2899 my ($self, $id, @msg) = @_;
2900
2901 if ($self->extcmd == 2) {
2902 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2903 } elsif ($self->extcmd == 1) {
2904 #TODO: version 1, remove
2905 unshift @msg, msgtype => "reply", msgid => $id;
2602 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2906 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2603 } 2907 }
2604} 2908}
2605 2909
2606=item $success = $client->query ($flags, "text", \&cb) 2910=item $success = $client->query ($flags, "text", \&cb)
2668 my ($type, $reply, @payload) = 2972 my ($type, $reply, @payload) =
2669 "ARRAY" eq ref $msg 2973 "ARRAY" eq ref $msg
2670 ? @$msg 2974 ? @$msg
2671 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2975 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2672 2976
2977 my @reply;
2978
2673 if (my $cb = $EXTICMD{$type}) { 2979 if (my $cb = $EXTICMD{$type}) {
2674 my @reply = $cb->($ns, @payload); 2980 @reply = $cb->($ns, @payload);
2675
2676 $ns->ext_reply ($reply, @reply)
2677 if $reply;
2678 } 2981 }
2982
2983 $ns->ext_reply ($reply, @reply)
2984 if $reply;
2985
2679 } else { 2986 } else {
2680 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2987 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2681 } 2988 }
2682 2989
2683 cf::override; 2990 cf::override;
2743=pod 3050=pod
2744 3051
2745The following functions and methods are available within a safe environment: 3052The following functions and methods are available within a safe environment:
2746 3053
2747 cf::object 3054 cf::object
2748 contr pay_amount pay_player map x y force_find force_add 3055 contr pay_amount pay_player map x y force_find force_add destroy
2749 insert remove name archname title slaying race 3056 insert remove name archname title slaying race decrease split
2750 3057
2751 cf::object::player 3058 cf::object::player
2752 player 3059 player
2753 3060
2754 cf::player 3061 cf::player
2759 3066
2760=cut 3067=cut
2761 3068
2762for ( 3069for (
2763 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3070 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2764 insert remove inv name archname title slaying race)], 3071 insert remove inv nrof name archname title slaying race
3072 decrease split destroy change_exp)],
2765 ["cf::object::player" => qw(player)], 3073 ["cf::object::player" => qw(player)],
2766 ["cf::player" => qw(peaceful)], 3074 ["cf::player" => qw(peaceful)],
2767 ["cf::map" => qw(trigger)], 3075 ["cf::map" => qw(trigger)],
2768) { 3076) {
2769 no strict 'refs'; 3077 no strict 'refs';
2845# the server's init and main functions 3153# the server's init and main functions
2846 3154
2847sub load_facedata($) { 3155sub load_facedata($) {
2848 my ($path) = @_; 3156 my ($path) = @_;
2849 3157
3158 # HACK to clear player env face cache, we need some signal framework
3159 # for this (global event?)
3160 %ext::player_env::MUSIC_FACE_CACHE = ();
3161
3162 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3163
2850 warn "loading facedata from $path\n"; 3164 warn "loading facedata from $path\n";
2851 3165
2852 my $facedata; 3166 my $facedata;
2853 0 < aio_load $path, $facedata 3167 0 < aio_load $path, $facedata
2854 or die "$path: $!"; 3168 or die "$path: $!";
2856 $facedata = Coro::Storable::thaw $facedata; 3170 $facedata = Coro::Storable::thaw $facedata;
2857 3171
2858 $facedata->{version} == 2 3172 $facedata->{version} == 2
2859 or cf::cleanup "$path: version mismatch, cannot proceed."; 3173 or cf::cleanup "$path: version mismatch, cannot proceed.";
2860 3174
3175 # patch in the exptable
3176 $facedata->{resource}{"res/exp_table"} = {
3177 type => FT_RSRC,
3178 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3179 };
3180 cf::cede_to_tick;
3181
2861 { 3182 {
2862 my $faces = $facedata->{faceinfo}; 3183 my $faces = $facedata->{faceinfo};
2863 3184
2864 while (my ($face, $info) = each %$faces) { 3185 while (my ($face, $info) = each %$faces) {
2865 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3186 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3187
2866 cf::face::set_visibility $idx, $info->{visibility}; 3188 cf::face::set_visibility $idx, $info->{visibility};
2867 cf::face::set_magicmap $idx, $info->{magicmap}; 3189 cf::face::set_magicmap $idx, $info->{magicmap};
2868 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3190 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2869 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3191 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2870 3192
2871 cf::cede_to_tick; 3193 cf::cede_to_tick;
2872 } 3194 }
2873 3195
2874 while (my ($face, $info) = each %$faces) { 3196 while (my ($face, $info) = each %$faces) {
2875 next unless $info->{smooth}; 3197 next unless $info->{smooth};
3198
2876 my $idx = cf::face::find $face 3199 my $idx = cf::face::find $face
2877 or next; 3200 or next;
3201
2878 if (my $smooth = cf::face::find $info->{smooth}) { 3202 if (my $smooth = cf::face::find $info->{smooth}) {
2879 cf::face::set_smooth $idx, $smooth; 3203 cf::face::set_smooth $idx, $smooth;
2880 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3204 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2881 } else { 3205 } else {
2882 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3206 warn "smooth face '$info->{smooth}' not found for face '$face'";
2899 3223
2900 { 3224 {
2901 # TODO: for gcfclient pleasure, we should give resources 3225 # TODO: for gcfclient pleasure, we should give resources
2902 # that gcfclient doesn't grok a >10000 face index. 3226 # that gcfclient doesn't grok a >10000 face index.
2903 my $res = $facedata->{resource}; 3227 my $res = $facedata->{resource};
2904 my $enc = JSON::XS->new->utf8->canonical;
2905
2906 my $soundconf = delete $res->{"res/sound.conf"};
2907 3228
2908 while (my ($name, $info) = each %$res) { 3229 while (my ($name, $info) = each %$res) {
2909 my $meta = $enc->encode ({ 3230 if (defined $info->{type}) {
2910 name => $name,
2911 %{ $info->{meta} || {} },
2912 });
2913
2914 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3231 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3232 my $data;
2915 3233
2916 if ($info->{type} & 1) { 3234 if ($info->{type} & 1) {
2917 # prepend meta info 3235 # prepend meta info
2918 3236
3237 my $meta = $enc->encode ({
3238 name => $name,
3239 %{ $info->{meta} || {} },
3240 });
3241
2919 my $data = pack "(w/a*)*", $meta, $info->{data}; 3242 $data = pack "(w/a*)*", $meta, $info->{data};
2920 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata 3243 } else {
3244 $data = $info->{data};
3245 }
2921 3246
2922 cf::face::set_data $idx, 0, $data, $chk; 3247 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3248 cf::face::set_type $idx, $info->{type};
2923 } else { 3249 } else {
2924 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3250 $RESOURCE{$name} = $info;
2925 } 3251 }
2926 3252
2927 cf::face::set_type $idx, $info->{type};
2928
2929 cf::cede_to_tick; 3253 cf::cede_to_tick;
2930 } 3254 }
2931
2932 if ($soundconf) {
2933 $soundconf = $enc->decode (delete $soundconf->{data});
2934
2935 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2936 my $sound = $soundconf->{compat}[$_]
2937 or next;
2938
2939 my $face = cf::face::find "sound/$sound->[1]";
2940 cf::sound::set $sound->[0] => $face;
2941 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2942 }
2943
2944 while (my ($k, $v) = each %{$soundconf->{event}}) {
2945 my $face = cf::face::find "sound/$v";
2946 cf::sound::set $k => $face;
2947 }
2948 }
2949 } 3255 }
3256
3257 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2950 3258
2951 1 3259 1
2952} 3260}
3261
3262cf::global->attach (on_resource_update => sub {
3263 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3264 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3265
3266 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3267 my $sound = $soundconf->{compat}[$_]
3268 or next;
3269
3270 my $face = cf::face::find "sound/$sound->[1]";
3271 cf::sound::set $sound->[0] => $face;
3272 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3273 }
3274
3275 while (my ($k, $v) = each %{$soundconf->{event}}) {
3276 my $face = cf::face::find "sound/$v";
3277 cf::sound::set $k => $face;
3278 }
3279 }
3280});
2953 3281
2954register_exticmd fx_want => sub { 3282register_exticmd fx_want => sub {
2955 my ($ns, $want) = @_; 3283 my ($ns, $want) = @_;
2956 3284
2957 while (my ($k, $v) = each %$want) { 3285 while (my ($k, $v) = each %$want) {
2958 $ns->fx_want ($k, $v); 3286 $ns->fx_want ($k, $v);
2959 } 3287 }
2960}; 3288};
2961 3289
3290sub load_resource_file($) {
3291 my $guard = lock_acquire "load_resource_file";
3292
3293 my $status = load_resource_file_ $_[0];
3294 get_slot 0.1, 100;
3295 cf::arch::commit_load;
3296
3297 $status
3298}
3299
2962sub reload_regions { 3300sub reload_regions {
3301 # HACK to clear player env face cache, we need some signal framework
3302 # for this (global event?)
3303 %ext::player_env::MUSIC_FACE_CACHE = ();
3304
2963 load_resource_file "$MAPDIR/regions" 3305 load_resource_file "$MAPDIR/regions"
2964 or die "unable to load regions file\n"; 3306 or die "unable to load regions file\n";
2965 3307
2966 for (cf::region::list) { 3308 for (cf::region::list) {
2967 $_->{match} = qr/$_->{match}/ 3309 $_->{match} = qr/$_->{match}/
2975} 3317}
2976 3318
2977sub reload_archetypes { 3319sub reload_archetypes {
2978 load_resource_file "$DATADIR/archetypes" 3320 load_resource_file "$DATADIR/archetypes"
2979 or die "unable to load archetypes\n"; 3321 or die "unable to load archetypes\n";
2980 #d# NEED to laod twice to resolve forward references
2981 # this really needs to be done in an extra post-pass
2982 # (which needs to be synchronous, so solve it differently)
2983 load_resource_file "$DATADIR/archetypes"
2984 or die "unable to load archetypes\n";
2985} 3322}
2986 3323
2987sub reload_treasures { 3324sub reload_treasures {
2988 load_resource_file "$DATADIR/treasures" 3325 load_resource_file "$DATADIR/treasures"
2989 or die "unable to load treasurelists\n"; 3326 or die "unable to load treasurelists\n";
2990} 3327}
2991 3328
2992sub reload_resources { 3329sub reload_resources {
2993 warn "reloading resource files...\n"; 3330 warn "reloading resource files...\n";
2994 3331
3332 reload_facedata;
3333 reload_archetypes;
2995 reload_regions; 3334 reload_regions;
2996 reload_facedata;
2997 #reload_archetypes;#d#
2998 reload_archetypes;
2999 reload_treasures; 3335 reload_treasures;
3000 3336
3001 warn "finished reloading resource files\n"; 3337 warn "finished reloading resource files\n";
3002} 3338}
3003 3339
3004sub init { 3340sub reload_config {
3005 reload_resources;
3006}
3007
3008sub cfg_load {
3009 open my $fh, "<:utf8", "$CONFDIR/config" 3341 open my $fh, "<:utf8", "$CONFDIR/config"
3010 or return; 3342 or return;
3011 3343
3012 local $/; 3344 local $/;
3013 *CFG = YAML::Syck::Load <$fh>; 3345 *CFG = YAML::Load <$fh>;
3014 3346
3015 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3347 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3016 3348
3017 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3349 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3018 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3350 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3024 }; 3356 };
3025 warn $@ if $@; 3357 warn $@ if $@;
3026 } 3358 }
3027} 3359}
3028 3360
3361sub pidfile() {
3362 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3363 or die "$PIDFILE: $!";
3364 flock $fh, &Fcntl::LOCK_EX
3365 or die "$PIDFILE: flock: $!";
3366 $fh
3367}
3368
3369# make sure only one server instance is running at any one time
3370sub atomic {
3371 my $fh = pidfile;
3372
3373 my $pid = <$fh>;
3374 kill 9, $pid if $pid > 0;
3375
3376 seek $fh, 0, 0;
3377 print $fh $$;
3378}
3379
3029sub main { 3380sub main {
3381 cf::init_globals; # initialise logging
3382
3383 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3384 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3385 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3386 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3387
3388 cf::init_experience;
3389 cf::init_anim;
3390 cf::init_attackmess;
3391 cf::init_dynamic;
3392
3393 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3394
3030 # we must not ever block the main coroutine 3395 # we must not ever block the main coroutine
3031 local $Coro::idle = sub { 3396 local $Coro::idle = sub {
3032 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3397 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3033 (async { 3398 (async {
3034 Event::one_event; 3399 $Coro::current->{desc} = "IDLE BUG HANDLER";
3400 EV::loop EV::LOOP_ONESHOT;
3035 })->prio (Coro::PRIO_MAX); 3401 })->prio (Coro::PRIO_MAX);
3036 }; 3402 };
3037 3403
3038 cfg_load; 3404 evthread_start IO::AIO::poll_fileno;
3405
3406 cf::sync_job {
3407 reload_resources;
3408 reload_config;
3039 db_init; 3409 db_init;
3410
3411 cf::load_settings;
3412 cf::load_materials;
3413 cf::init_uuid;
3414 cf::init_signals;
3415 cf::init_commands;
3416 cf::init_skills;
3417
3418 cf::init_beforeplay;
3419
3420 atomic;
3421
3040 load_extensions; 3422 load_extensions;
3041 3423
3042 $TICK_WATCHER->start; 3424 utime time, time, $RUNTIMEFILE;
3425
3426 # no (long-running) fork's whatsoever before this point(!)
3427 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3428
3429 (pop @POST_INIT)->(0) while @POST_INIT;
3430 };
3431
3043 Event::loop; 3432 EV::loop;
3044} 3433}
3045 3434
3046############################################################################# 3435#############################################################################
3047# initialisation and cleanup 3436# initialisation and cleanup
3048 3437
3049# install some emergency cleanup handlers 3438# install some emergency cleanup handlers
3050BEGIN { 3439BEGIN {
3440 our %SIGWATCHER = ();
3051 for my $signal (qw(INT HUP TERM)) { 3441 for my $signal (qw(INT HUP TERM)) {
3052 Event->signal ( 3442 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3053 reentrant => 0,
3054 data => WF_AUTOCANCEL,
3055 signal => $signal,
3056 prio => 0,
3057 cb => sub {
3058 cf::cleanup "SIG$signal"; 3443 cf::cleanup "SIG$signal";
3059 },
3060 ); 3444 };
3061 } 3445 }
3062} 3446}
3063 3447
3064sub write_runtime { 3448sub write_runtime_sync {
3065 my $runtime = "$LOCALDIR/runtime";
3066
3067 # first touch the runtime file to show we are still running: 3449 # first touch the runtime file to show we are still running:
3068 # the fsync below can take a very very long time. 3450 # the fsync below can take a very very long time.
3069 3451
3070 IO::AIO::aio_utime $runtime, undef, undef; 3452 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3071 3453
3072 my $guard = cf::lock_acquire "write_runtime"; 3454 my $guard = cf::lock_acquire "write_runtime";
3073 3455
3074 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3456 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3075 or return; 3457 or return;
3076 3458
3077 my $value = $cf::RUNTIME + 90 + 10; 3459 my $value = $cf::RUNTIME + 90 + 10;
3078 # 10 is the runtime save interval, for a monotonic clock 3460 # 10 is the runtime save interval, for a monotonic clock
3079 # 60 allows for the watchdog to kill the server. 3461 # 60 allows for the watchdog to kill the server.
3089 aio_utime $fh, undef, undef; 3471 aio_utime $fh, undef, undef;
3090 3472
3091 close $fh 3473 close $fh
3092 or return; 3474 or return;
3093 3475
3094 aio_rename "$runtime~", $runtime 3476 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3095 and return; 3477 and return;
3096 3478
3097 warn "runtime file written.\n"; 3479 warn "runtime file written.\n";
3098 3480
3099 1 3481 1
3482}
3483
3484our $uuid_lock;
3485our $uuid_skip;
3486
3487sub write_uuid_sync($) {
3488 $uuid_skip ||= $_[0];
3489
3490 return if $uuid_lock;
3491 local $uuid_lock = 1;
3492
3493 my $uuid = "$LOCALDIR/uuid";
3494
3495 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3496 or return;
3497
3498 my $value = uuid_seq uuid_cur;
3499
3500 unless ($value) {
3501 warn "cowardly refusing to write zero uuid value!\n";
3502 return;
3503 }
3504
3505 my $value = uuid_str $value + $uuid_skip;
3506 $uuid_skip = 0;
3507
3508 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3509 and return;
3510
3511 # always fsync - this file is important
3512 aio_fsync $fh
3513 and return;
3514
3515 close $fh
3516 or return;
3517
3518 aio_rename "$uuid~", $uuid
3519 and return;
3520
3521 warn "uuid file written ($value).\n";
3522
3523 1
3524
3525}
3526
3527sub write_uuid($$) {
3528 my ($skip, $sync) = @_;
3529
3530 $sync ? write_uuid_sync $skip
3531 : async { write_uuid_sync $skip };
3100} 3532}
3101 3533
3102sub emergency_save() { 3534sub emergency_save() {
3103 my $freeze_guard = cf::freeze_mainloop; 3535 my $freeze_guard = cf::freeze_mainloop;
3104 3536
3105 warn "enter emergency perl save\n"; 3537 warn "emergency_perl_save: enter\n";
3106 3538
3107 cf::sync_job { 3539 cf::sync_job {
3540 # this is a trade-off: we want to be very quick here, so
3541 # save all maps without fsync, and later call a global sync
3542 # (which in turn might be very very slow)
3543 local $USE_FSYNC = 0;
3544
3108 # use a peculiar iteration method to avoid tripping on perl 3545 # use a peculiar iteration method to avoid tripping on perl
3109 # refcount bugs in for. also avoids problems with players 3546 # refcount bugs in for. also avoids problems with players
3110 # and maps saved/destroyed asynchronously. 3547 # and maps saved/destroyed asynchronously.
3111 warn "begin emergency player save\n"; 3548 warn "emergency_perl_save: begin player save\n";
3112 for my $login (keys %cf::PLAYER) { 3549 for my $login (keys %cf::PLAYER) {
3113 my $pl = $cf::PLAYER{$login} or next; 3550 my $pl = $cf::PLAYER{$login} or next;
3114 $pl->valid or next; 3551 $pl->valid or next;
3552 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3115 $pl->save; 3553 $pl->save;
3116 } 3554 }
3117 warn "end emergency player save\n"; 3555 warn "emergency_perl_save: end player save\n";
3118 3556
3119 warn "begin emergency map save\n"; 3557 warn "emergency_perl_save: begin map save\n";
3120 for my $path (keys %cf::MAP) { 3558 for my $path (keys %cf::MAP) {
3121 my $map = $cf::MAP{$path} or next; 3559 my $map = $cf::MAP{$path} or next;
3122 $map->valid or next; 3560 $map->valid or next;
3123 $map->save; 3561 $map->save;
3124 } 3562 }
3125 warn "end emergency map save\n"; 3563 warn "emergency_perl_save: end map save\n";
3126 3564
3127 warn "begin emergency database checkpoint\n"; 3565 warn "emergency_perl_save: begin database checkpoint\n";
3128 BDB::db_env_txn_checkpoint $DB_ENV; 3566 BDB::db_env_txn_checkpoint $DB_ENV;
3129 warn "end emergency database checkpoint\n"; 3567 warn "emergency_perl_save: end database checkpoint\n";
3568
3569 warn "emergency_perl_save: begin write uuid\n";
3570 write_uuid_sync 1;
3571 warn "emergency_perl_save: end write uuid\n";
3130 }; 3572 };
3131 3573
3574 warn "emergency_perl_save: starting sync()\n";
3575 IO::AIO::aio_sync sub {
3576 warn "emergency_perl_save: finished sync()\n";
3577 };
3578
3132 warn "leave emergency perl save\n"; 3579 warn "emergency_perl_save: leave\n";
3133} 3580}
3134 3581
3135sub post_cleanup { 3582sub post_cleanup {
3136 my ($make_core) = @_; 3583 my ($make_core) = @_;
3137 3584
3138 warn Carp::longmess "post_cleanup backtrace" 3585 warn Carp::longmess "post_cleanup backtrace"
3139 if $make_core; 3586 if $make_core;
3587
3588 my $fh = pidfile;
3589 unlink $PIDFILE if <$fh> == $$;
3590}
3591
3592# a safer delete_package, copied from Symbol
3593sub clear_package($) {
3594 my $pkg = shift;
3595
3596 # expand to full symbol table name if needed
3597 unless ($pkg =~ /^main::.*::$/) {
3598 $pkg = "main$pkg" if $pkg =~ /^::/;
3599 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3600 $pkg .= '::' unless $pkg =~ /::$/;
3601 }
3602
3603 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3604 my $stem_symtab = *{$stem}{HASH};
3605
3606 defined $stem_symtab and exists $stem_symtab->{$leaf}
3607 or return;
3608
3609 # clear all symbols
3610 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3611 for my $name (keys %$leaf_symtab) {
3612 _gv_clear *{"$pkg$name"};
3613# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3614 }
3615 warn "cleared package $pkg\n";#d#
3140} 3616}
3141 3617
3142sub do_reload_perl() { 3618sub do_reload_perl() {
3143 # can/must only be called in main 3619 # can/must only be called in main
3144 if ($Coro::current != $Coro::main) { 3620 if ($Coro::current != $Coro::main) {
3145 warn "can only reload from main coroutine"; 3621 warn "can only reload from main coroutine";
3146 return; 3622 return;
3147 } 3623 }
3148 3624
3625 return if $RELOAD++;
3626
3627 my $t1 = EV::time;
3628
3629 while ($RELOAD) {
3149 warn "reloading..."; 3630 warn "reloading...";
3150 3631
3151 warn "entering sync_job"; 3632 warn "entering sync_job";
3152 3633
3153 cf::sync_job { 3634 cf::sync_job {
3154 cf::write_runtime; # external watchdog should not bark 3635 cf::write_runtime_sync; # external watchdog should not bark
3155 cf::emergency_save; 3636 cf::emergency_save;
3156 cf::write_runtime; # external watchdog should not bark 3637 cf::write_runtime_sync; # external watchdog should not bark
3157 3638
3158 warn "syncing database to disk"; 3639 warn "syncing database to disk";
3159 BDB::db_env_txn_checkpoint $DB_ENV; 3640 BDB::db_env_txn_checkpoint $DB_ENV;
3160 3641
3161 # if anything goes wrong in here, we should simply crash as we already saved 3642 # if anything goes wrong in here, we should simply crash as we already saved
3162 3643
3163 warn "cancelling all WF_AUTOCANCEL watchers";
3164 for (Event::all_watchers) {
3165 $_->cancel if $_->data & WF_AUTOCANCEL;
3166 }
3167
3168 warn "flushing outstanding aio requests"; 3644 warn "flushing outstanding aio requests";
3169 for (;;) {
3170 BDB::flush;
3171 IO::AIO::flush;
3172 Coro::cede;
3173 last unless IO::AIO::nreqs || BDB::nreqs; 3645 while (IO::AIO::nreqs || BDB::nreqs) {
3174 warn "iterate..."; 3646 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3175 }
3176
3177 ++$RELOAD;
3178
3179 warn "cancelling all extension coros";
3180 $_->cancel for values %EXT_CORO;
3181 %EXT_CORO = ();
3182
3183 warn "removing commands";
3184 %COMMAND = ();
3185
3186 warn "removing ext/exti commands";
3187 %EXTCMD = ();
3188 %EXTICMD = ();
3189
3190 warn "unloading/nuking all extensions";
3191 for my $pkg (@EXTS) {
3192 warn "... unloading $pkg";
3193
3194 if (my $cb = $pkg->can ("unload")) {
3195 eval {
3196 $cb->($pkg);
3197 1
3198 } or warn "$pkg unloaded, but with errors: $@";
3199 } 3647 }
3200 3648
3201 warn "... nuking $pkg"; 3649 warn "cancelling all extension coros";
3202 Symbol::delete_package $pkg; 3650 $_->cancel for values %EXT_CORO;
3203 } 3651 %EXT_CORO = ();
3204 3652
3205 warn "unloading all perl modules loaded from $LIBDIR"; 3653 warn "removing commands";
3206 while (my ($k, $v) = each %INC) { 3654 %COMMAND = ();
3207 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3208 3655
3656 warn "removing ext/exti commands";
3657 %EXTCMD = ();
3658 %EXTICMD = ();
3659
3660 warn "unloading/nuking all extensions";
3661 for my $pkg (@EXTS) {
3209 warn "... unloading $k"; 3662 warn "... unloading $pkg";
3210 delete $INC{$k};
3211 3663
3212 $k =~ s/\.pm$//;
3213 $k =~ s/\//::/g;
3214
3215 if (my $cb = $k->can ("unload_module")) { 3664 if (my $cb = $pkg->can ("unload")) {
3665 eval {
3216 $cb->(); 3666 $cb->($pkg);
3667 1
3668 } or warn "$pkg unloaded, but with errors: $@";
3669 }
3670
3671 warn "... clearing $pkg";
3672 clear_package $pkg;
3217 } 3673 }
3218 3674
3219 Symbol::delete_package $k; 3675 warn "unloading all perl modules loaded from $LIBDIR";
3676 while (my ($k, $v) = each %INC) {
3677 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3678
3679 warn "... unloading $k";
3680 delete $INC{$k};
3681
3682 $k =~ s/\.pm$//;
3683 $k =~ s/\//::/g;
3684
3685 if (my $cb = $k->can ("unload_module")) {
3686 $cb->();
3687 }
3688
3689 clear_package $k;
3220 } 3690 }
3221 3691
3222 warn "getting rid of safe::, as good as possible"; 3692 warn "getting rid of safe::, as good as possible";
3223 Symbol::delete_package "safe::$_" 3693 clear_package "safe::$_"
3224 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3694 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3225 3695
3226 warn "unloading cf.pm \"a bit\""; 3696 warn "unloading cf.pm \"a bit\"";
3227 delete $INC{"cf.pm"}; 3697 delete $INC{"cf.pm"};
3228 delete $INC{"cf/pod.pm"}; 3698 delete $INC{"cf/pod.pm"};
3229 3699
3230 # don't, removes xs symbols, too, 3700 # don't, removes xs symbols, too,
3231 # and global variables created in xs 3701 # and global variables created in xs
3232 #Symbol::delete_package __PACKAGE__; 3702 #clear_package __PACKAGE__;
3233 3703
3234 warn "unload completed, starting to reload now"; 3704 warn "unload completed, starting to reload now";
3235 3705
3236 warn "reloading cf.pm"; 3706 warn "reloading cf.pm";
3237 require cf; 3707 require cf;
3238 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3708 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3239 3709
3240 warn "loading config and database again"; 3710 warn "loading config and database again";
3241 cf::cfg_load; 3711 cf::reload_config;
3242 3712
3243 warn "loading extensions"; 3713 warn "loading extensions";
3244 cf::load_extensions; 3714 cf::load_extensions;
3245 3715
3716 if ($REATTACH_ON_RELOAD) {
3246 warn "reattaching attachments to objects/players"; 3717 warn "reattaching attachments to objects/players";
3247 _global_reattach; # objects, sockets 3718 _global_reattach; # objects, sockets
3248 warn "reattaching attachments to maps"; 3719 warn "reattaching attachments to maps";
3249 reattach $_ for values %MAP; 3720 reattach $_ for values %MAP;
3250 warn "reattaching attachments to players"; 3721 warn "reattaching attachments to players";
3251 reattach $_ for values %PLAYER; 3722 reattach $_ for values %PLAYER;
3723 }
3252 3724
3725 warn "running post_init jobs";
3726 (pop @POST_INIT)->(1) while @POST_INIT;
3727
3253 warn "leaving sync_job"; 3728 warn "leaving sync_job";
3254 3729
3255 1 3730 1
3256 } or do { 3731 } or do {
3257 warn $@; 3732 warn $@;
3258 warn "error while reloading, exiting."; 3733 cf::cleanup "error while reloading, exiting.";
3259 exit 1;
3260 }; 3734 };
3261 3735
3262 warn "reloaded"; 3736 warn "reloaded";
3737 --$RELOAD;
3738 }
3739
3740 $t1 = EV::time - $t1;
3741 warn "reload completed in ${t1}s\n";
3263}; 3742};
3264 3743
3265our $RELOAD_WATCHER; # used only during reload 3744our $RELOAD_WATCHER; # used only during reload
3266 3745
3267sub reload_perl() { 3746sub reload_perl() {
3268 # doing reload synchronously and two reloads happen back-to-back, 3747 # doing reload synchronously and two reloads happen back-to-back,
3269 # coro crashes during coro_state_free->destroy here. 3748 # coro crashes during coro_state_free->destroy here.
3270 3749
3271 $RELOAD_WATCHER ||= Event->timer ( 3750 $RELOAD_WATCHER ||= cf::async {
3272 reentrant => 0, 3751 Coro::AIO::aio_wait cache_extensions;
3273 after => 0, 3752
3274 data => WF_AUTOCANCEL, 3753 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3275 cb => sub {
3276 do_reload_perl; 3754 do_reload_perl;
3277 undef $RELOAD_WATCHER; 3755 undef $RELOAD_WATCHER;
3278 }, 3756 };
3279 ); 3757 };
3280} 3758}
3281 3759
3282register_command "reload" => sub { 3760register_command "reload" => sub {
3283 my ($who, $arg) = @_; 3761 my ($who, $arg) = @_;
3284 3762
3285 if ($who->flag (FLAG_WIZ)) { 3763 if ($who->flag (FLAG_WIZ)) {
3286 $who->message ("reloading server."); 3764 $who->message ("reloading server.");
3765 async {
3766 $Coro::current->{desc} = "perl_reload";
3287 async { reload_perl }; 3767 reload_perl;
3768 };
3288 } 3769 }
3289}; 3770};
3290 3771
3291unshift @INC, $LIBDIR; 3772unshift @INC, $LIBDIR;
3292 3773
3294 3775
3295our @WAIT_FOR_TICK; 3776our @WAIT_FOR_TICK;
3296our @WAIT_FOR_TICK_BEGIN; 3777our @WAIT_FOR_TICK_BEGIN;
3297 3778
3298sub wait_for_tick { 3779sub wait_for_tick {
3299 return unless $TICK_WATCHER->is_active;
3300 return if $Coro::current == $Coro::main; 3780 return if tick_inhibit || $Coro::current == $Coro::main;
3301 3781
3302 my $signal = new Coro::Signal; 3782 my $signal = new Coro::Signal;
3303 push @WAIT_FOR_TICK, $signal; 3783 push @WAIT_FOR_TICK, $signal;
3304 $signal->wait; 3784 $signal->wait;
3305} 3785}
3306 3786
3307sub wait_for_tick_begin { 3787sub wait_for_tick_begin {
3308 return unless $TICK_WATCHER->is_active;
3309 return if $Coro::current == $Coro::main; 3788 return if tick_inhibit || $Coro::current == $Coro::main;
3310 3789
3311 my $signal = new Coro::Signal; 3790 my $signal = new Coro::Signal;
3312 push @WAIT_FOR_TICK_BEGIN, $signal; 3791 push @WAIT_FOR_TICK_BEGIN, $signal;
3313 $signal->wait; 3792 $signal->wait;
3314} 3793}
3315 3794
3316 my $min = 1e6;#d# 3795sub tick {
3317 my $avg = 10;
3318$TICK_WATCHER = Event->timer (
3319 reentrant => 0,
3320 parked => 1,
3321 prio => 0,
3322 at => $NEXT_TICK || $TICK,
3323 data => WF_AUTOCANCEL,
3324 cb => sub {
3325 if ($Coro::current != $Coro::main) { 3796 if ($Coro::current != $Coro::main) {
3326 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3797 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3327 unless ++$bug_warning > 10; 3798 unless ++$bug_warning > 10;
3328 return; 3799 return;
3329 } 3800 }
3330 3801
3331 $NOW = $tick_start = Event::time;
3332
3333 cf::server_tick; # one server iteration 3802 cf::server_tick; # one server iteration
3334 3803
3335 0 && sync_job {#d# 3804 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3336 for(1..10) { 3805 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3337 my $t = Event::time; 3806 Coro::async_pool {
3338 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3807 $Coro::current->{desc} = "runtime saver";
3339 or die; 3808 write_runtime_sync
3340 3809 or warn "ERROR: unable to write runtime file: $!";
3341 $map->width (50);
3342 $map->height (50);
3343 $map->alloc;
3344 $map->_load_objects ("/tmp/x.map", 1);
3345 my $t = Event::time - $t;
3346
3347 #next unless $t < 0.0013;#d#
3348 if ($t < $min) {
3349 $min = $t;
3350 }
3351 $avg = $avg * 0.99 + $t * 0.01;
3352 }
3353 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3354 exit 0;
3355 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3356 }; 3810 };
3811 }
3357 3812
3358 $RUNTIME += $TICK;
3359 $NEXT_TICK += $TICK;
3360
3361 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3362 $NEXT_RUNTIME_WRITE = $NOW + 10;
3363 Coro::async_pool {
3364 write_runtime
3365 or warn "ERROR: unable to write runtime file: $!";
3366 };
3367 }
3368
3369# my $AFTER = Event::time;
3370# warn $AFTER - $NOW;#d#
3371
3372 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3813 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3373 $sig->send; 3814 $sig->send;
3374 } 3815 }
3375 while (my $sig = shift @WAIT_FOR_TICK) { 3816 while (my $sig = shift @WAIT_FOR_TICK) {
3376 $sig->send; 3817 $sig->send;
3377 } 3818 }
3378 3819
3379 $NOW = Event::time; 3820 $LOAD = ($NOW - $TICK_START) / $TICK;
3380
3381 # if we are delayed by four ticks or more, skip them all
3382 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3383
3384 $TICK_WATCHER->at ($NEXT_TICK);
3385 $TICK_WATCHER->start;
3386
3387 $LOAD = ($NOW - $tick_start) / $TICK;
3388 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3821 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3389 3822
3390 _post_tick; 3823 if (0) {
3391 3824 if ($NEXT_TICK) {
3392 3825 my $jitter = $TICK_START - $NEXT_TICK;
3826 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3827 warn "jitter $JITTER\n";#d#
3828 }
3393 }, 3829 }
3394); 3830}
3395 3831
3396{ 3832{
3397 BDB::max_poll_time $TICK * 0.1; 3833 # configure BDB
3398 $BDB_POLL_WATCHER = Event->io ( 3834
3399 reentrant => 0,
3400 fd => BDB::poll_fileno,
3401 poll => 'r',
3402 prio => 0,
3403 data => WF_AUTOCANCEL,
3404 cb => \&BDB::poll_cb,
3405 );
3406 BDB::min_parallel 8; 3835 BDB::min_parallel 8;
3407 3836 BDB::max_poll_reqs $TICK * 0.1;
3408 BDB::set_sync_prepare { 3837 $AnyEvent::BDB::WATCHER->priority (1);
3409 my $status;
3410 my $current = $Coro::current;
3411 (
3412 sub {
3413 $status = $!;
3414 $current->ready; undef $current;
3415 },
3416 sub {
3417 Coro::schedule while defined $current;
3418 $! = $status;
3419 },
3420 )
3421 };
3422 3838
3423 unless ($DB_ENV) { 3839 unless ($DB_ENV) {
3424 $DB_ENV = BDB::db_env_create; 3840 $DB_ENV = BDB::db_env_create;
3841 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3842 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3843 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3844 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3845 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3425 3846
3426 cf::sync_job { 3847 cf::sync_job {
3427 eval { 3848 eval {
3428 BDB::db_env_open 3849 BDB::db_env_open
3429 $DB_ENV, 3850 $DB_ENV,
3431 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3852 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3432 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3853 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3433 0666; 3854 0666;
3434 3855
3435 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3856 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3436
3437 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3438 $DB_ENV->set_lk_detect;
3439 }; 3857 };
3440 3858
3441 cf::cleanup "db_env_open(db): $@" if $@; 3859 cf::cleanup "db_env_open(db): $@" if $@;
3442 }; 3860 };
3443 } 3861 }
3862
3863 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3864 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3865 };
3866 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3867 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3868 };
3869 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3870 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3871 };
3444} 3872}
3445 3873
3446{ 3874{
3875 # configure IO::AIO
3876
3447 IO::AIO::min_parallel 8; 3877 IO::AIO::min_parallel 8;
3448
3449 undef $Coro::AIO::WATCHER;
3450 IO::AIO::max_poll_time $TICK * 0.1; 3878 IO::AIO::max_poll_time $TICK * 0.1;
3451 $AIO_POLL_WATCHER = Event->io ( 3879 undef $AnyEvent::AIO::WATCHER;
3452 reentrant => 0,
3453 data => WF_AUTOCANCEL,
3454 fd => IO::AIO::poll_fileno,
3455 poll => 'r',
3456 prio => 6,
3457 cb => \&IO::AIO::poll_cb,
3458 );
3459} 3880}
3460 3881
3461my $_log_backtrace; 3882my $_log_backtrace;
3462 3883
3463sub _log_backtrace { 3884sub _log_backtrace {
3466 $msg =~ s/\n//; 3887 $msg =~ s/\n//;
3467 3888
3468 # limit the # of concurrent backtraces 3889 # limit the # of concurrent backtraces
3469 if ($_log_backtrace < 2) { 3890 if ($_log_backtrace < 2) {
3470 ++$_log_backtrace; 3891 ++$_log_backtrace;
3892 my $perl_bt = Carp::longmess $msg;
3471 async { 3893 async {
3894 $Coro::current->{desc} = "abt $msg";
3895
3472 my @bt = fork_call { 3896 my @bt = fork_call {
3473 @addr = map { sprintf "%x", $_ } @addr; 3897 @addr = map { sprintf "%x", $_ } @addr;
3474 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3898 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3475 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3899 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3476 or die "addr2line: $!"; 3900 or die "addr2line: $!";
3484 } 3908 }
3485 3909
3486 @funcs 3910 @funcs
3487 }; 3911 };
3488 3912
3489 LOG llevInfo, "[ABT] $msg\n"; 3913 LOG llevInfo, "[ABT] $perl_bt\n";
3914 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3490 LOG llevInfo, "[ABT] $_\n" for @bt; 3915 LOG llevInfo, "[ABT] $_\n" for @bt;
3491 --$_log_backtrace; 3916 --$_log_backtrace;
3492 }; 3917 };
3493 } else { 3918 } else {
3494 LOG llevInfo, "[ABT] $msg\n"; 3919 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines