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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines