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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines