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.326 by root, Tue Jul 31 17:33:15 2007 UTC vs.
Revision 1.475 by root, Tue Jul 21 06:17:00 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
… …
1372 $cf::PLAYER{$login} = $self; 1532 $cf::PLAYER{$login} = $self;
1373 1533
1374 $self 1534 $self
1375} 1535}
1376 1536
1537=item $player->send_msg ($channel, $msg, $color, [extra...])
1538
1539=cut
1540
1541sub send_msg {
1542 my $ns = shift->ns
1543 or return;
1544 $ns->send_msg (@_);
1545}
1546
1377=item $pl->quit_character 1547=item $pl->quit_character
1378 1548
1379Nukes the player without looking back. If logged in, the connection will 1549Nukes the player without looking back. If logged in, the connection will
1380be destroyed. May block for a long time. 1550be destroyed. May block for a long time.
1381 1551
… …
1385 my ($pl) = @_; 1555 my ($pl) = @_;
1386 1556
1387 my $name = $pl->ob->name; 1557 my $name = $pl->ob->name;
1388 1558
1389 $pl->{deny_save} = 1; 1559 $pl->{deny_save} = 1;
1390 $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
1391 1561
1392 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1562 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1393 $pl->deactivate; 1563 $pl->deactivate;
1564 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1565 $pl->ob->check_score;
1394 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1566 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1395 $pl->ns->destroy if $pl->ns; 1567 $pl->ns->destroy if $pl->ns;
1396 1568
1397 my $path = playerdir $pl; 1569 my $path = playerdir $pl;
1398 my $temp = "$path~$cf::RUNTIME~deleting~"; 1570 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1434 or return []; 1606 or return [];
1435 1607
1436 my @logins; 1608 my @logins;
1437 1609
1438 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") {
1439 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1616 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1440 aio_read $fh, 0, 512, my $buf, 0 or next; 1617 aio_read $fh, 0, 512, my $buf, 0 or next;
1441 $buf !~ /^password -------------$/m or next; # official not-valid tag 1618 $buf !~ /^password -------------$/m or next; # official not-valid tag
1619 }
1442 1620
1443 utf8::decode $login; 1621 utf8::decode $login;
1444 push @logins, $login; 1622 push @logins, $login;
1445 } 1623 }
1446 1624
… …
1473 } 1651 }
1474 1652
1475 \@paths 1653 \@paths
1476} 1654}
1477 1655
1478=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1656=item $protocol_xml = $player->expand_cfpod ($cfpod)
1479 1657
1480Expand crossfire pod fragments into protocol xml. 1658Expand deliantra pod fragments into protocol xml.
1481
1482=cut
1483
1484sub expand_cfpod {
1485 ((my $self), (local $_)) = @_;
1486
1487 # escape & and <
1488 s/&/&amp;/g;
1489 s/(?<![BIUGH])</&lt;/g;
1490
1491 # this is buggy, it needs to properly take care of nested <'s
1492
1493 1 while
1494 # replace B<>, I<>, U<> etc.
1495 s/B<([^\>]*)>/<b>$1<\/b>/
1496 || s/I<([^\>]*)>/<i>$1<\/i>/
1497 || s/U<([^\>]*)>/<u>$1<\/u>/
1498 # replace G<male|female> tags
1499 || s{G<([^>|]*)\|([^>]*)>}{
1500 $self->gender ? $2 : $1
1501 }ge
1502 # replace H<hint text>
1503 || s{H<([^\>]*)>}
1504 {
1505 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1506 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1507 "")
1508 [$self->{hintmode}]
1509 }ge;
1510
1511 # create single paragraphs (very hackish)
1512 s/(?<=\S)\n(?=\w)/ /g;
1513
1514 # compress some whitespace
1515 s/\s+\n/\n/g; # ws line-ends
1516 s/\n\n+/\n/g; # double lines
1517 s/^\n+//; # beginning lines
1518 s/\n+$//; # ending lines
1519
1520 $_
1521}
1522
1523sub hintmode {
1524 $_[0]{hintmode} = $_[1] if @_ > 1;
1525 $_[0]{hintmode}
1526}
1527 1659
1528=item $player->ext_reply ($msgid, @msg) 1660=item $player->ext_reply ($msgid, @msg)
1529 1661
1530Sends an ext reply to the player. 1662Sends an ext reply to the player.
1531 1663
1532=cut 1664=cut
1533 1665
1534sub ext_reply($$@) { 1666sub ext_reply($$@) {
1535 my ($self, $id, @msg) = @_; 1667 my ($self, $id, @msg) = @_;
1536 1668
1537 if ($self->ns->extcmd == 2) { 1669 $self->ns->ext_reply ($id, @msg)
1538 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1539 } elsif ($self->ns->extcmd == 1) {
1540 #TODO: version 1, remove
1541 unshift @msg, msgtype => "reply", msgid => $id;
1542 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1543 }
1544} 1670}
1545 1671
1546=item $player->ext_msg ($type, @msg) 1672=item $player->ext_msg ($type, @msg)
1547 1673
1548Sends an ext event to the client. 1674Sends an ext event to the client.
… …
1604our $MAX_RESET = 3600; 1730our $MAX_RESET = 3600;
1605our $DEFAULT_RESET = 3000; 1731our $DEFAULT_RESET = 3000;
1606 1732
1607sub generate_random_map { 1733sub generate_random_map {
1608 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
1609 # mit "rum" bekleckern, nicht 1738 # mit "rum" bekleckern, nicht
1610 $self->_create_random_map ( 1739 $self->_create_random_map (
1611 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1740 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1612 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1741 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1613 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1742 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1735 1864
1736# the temporary/swap location 1865# the temporary/swap location
1737sub save_path { 1866sub save_path {
1738 my ($self) = @_; 1867 my ($self) = @_;
1739 1868
1740 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1869 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1741 "$TMPDIR/$path.map" 1870 "$TMPDIR/$path.map"
1742} 1871}
1743 1872
1744# the unique path, undef == no special unique path 1873# the unique path, undef == no special unique path
1745sub uniq_path { 1874sub uniq_path {
1746 my ($self) = @_; 1875 my ($self) = @_;
1747 1876
1748 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1877 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1749 "$UNIQUEDIR/$path" 1878 "$UNIQUEDIR/$path"
1750}
1751
1752# and all this just because we cannot iterate over
1753# all maps in C++...
1754sub change_all_map_light {
1755 my ($change) = @_;
1756
1757 $_->change_map_light ($change)
1758 for grep $_->outdoor, values %cf::MAP;
1759} 1879}
1760 1880
1761sub decay_objects { 1881sub decay_objects {
1762 my ($self) = @_; 1882 my ($self) = @_;
1763 1883
… …
1776 1896
1777sub load_header_from($) { 1897sub load_header_from($) {
1778 my ($self, $path) = @_; 1898 my ($self, $path) = @_;
1779 1899
1780 utf8::encode $path; 1900 utf8::encode $path;
1781 #aio_open $path, O_RDONLY, 0 1901 my $f = new_from_file cf::object::thawer $path
1782 # or return;
1783
1784 $self->_load_header ($path)
1785 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;
1786 1909
1787 $self->{load_path} = $path; 1910 $self->{load_path} = $path;
1788 1911
1789 1 1912 1
1790} 1913}
… …
1844sub find { 1967sub find {
1845 my ($path, $origin) = @_; 1968 my ($path, $origin) = @_;
1846 1969
1847 $path = normalise $path, $origin && $origin->path; 1970 $path = normalise $path, $origin && $origin->path;
1848 1971
1972 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1849 cf::lock_wait "map_find:$path"; 1973 my $guard2 = cf::lock_acquire "map_find:$path";
1850 1974
1851 $cf::MAP{$path} || do { 1975 $cf::MAP{$path} || do {
1852 my $guard = cf::lock_acquire "map_find:$path";
1853 my $map = new_from_path cf::map $path 1976 my $map = new_from_path cf::map $path
1854 or return; 1977 or return;
1855 1978
1856 $map->{last_save} = $cf::RUNTIME; 1979 $map->{last_save} = $cf::RUNTIME;
1857 1980
… …
1859 or return; 1982 or return;
1860 1983
1861 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1984 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1862 # doing this can freeze the server in a sync job, obviously 1985 # doing this can freeze the server in a sync job, obviously
1863 #$cf::WAIT_FOR_TICK->wait; 1986 #$cf::WAIT_FOR_TICK->wait;
1987 undef $guard2;
1988 undef $guard1;
1864 $map->reset; 1989 $map->reset;
1865 undef $guard;
1866 return find $path; 1990 return find $path;
1867 } 1991 }
1868 1992
1869 $cf::MAP{$path} = $map 1993 $cf::MAP{$path} = $map
1870 } 1994 }
… …
1879 local $self->{deny_reset} = 1; # loading can take a long time 2003 local $self->{deny_reset} = 1; # loading can take a long time
1880 2004
1881 my $path = $self->{path}; 2005 my $path = $self->{path};
1882 2006
1883 { 2007 {
1884 my $guard = cf::lock_acquire "map_load:$path"; 2008 my $guard = cf::lock_acquire "map_data:$path";
1885 2009
2010 return unless $self->valid;
1886 return if $self->in_memory != cf::MAP_SWAPPED; 2011 return unless $self->in_memory == cf::MAP_SWAPPED;
1887 2012
1888 $self->in_memory (cf::MAP_LOADING); 2013 $self->in_memory (cf::MAP_LOADING);
1889 2014
1890 $self->alloc; 2015 $self->alloc;
1891 2016
1892 $self->pre_load; 2017 $self->pre_load;
1893 Coro::cede; 2018 cf::cede_to_tick;
1894 2019
2020 my $f = new_from_file cf::object::thawer $self->{load_path};
2021 $f->skip_block;
1895 $self->_load_objects ($self->{load_path}, 1) 2022 $self->_load_objects ($f)
1896 or return; 2023 or return;
1897 2024
1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2025 $self->post_load_original
1899 if delete $self->{load_original}; 2026 if delete $self->{load_original};
1900 2027
1901 if (my $uniq = $self->uniq_path) { 2028 if (my $uniq = $self->uniq_path) {
1902 utf8::encode $uniq; 2029 utf8::encode $uniq;
1903 if (aio_open $uniq, O_RDONLY, 0) { 2030 unless (aio_stat $uniq) {
2031 if (my $f = new_from_file cf::object::thawer $uniq) {
1904 $self->clear_unique_items; 2032 $self->clear_unique_items;
1905 $self->_load_objects ($uniq, 0); 2033 $self->_load_objects ($f);
2034 $f->resolve_delayed_derefs;
2035 }
1906 } 2036 }
1907 } 2037 }
1908 2038
1909 Coro::cede; 2039 $f->resolve_delayed_derefs;
2040
2041 cf::cede_to_tick;
1910 # now do the right thing for maps 2042 # now do the right thing for maps
1911 $self->link_multipart_objects; 2043 $self->link_multipart_objects;
1912 $self->difficulty ($self->estimate_difficulty) 2044 $self->difficulty ($self->estimate_difficulty)
1913 unless $self->difficulty; 2045 unless $self->difficulty;
1914 Coro::cede; 2046 cf::cede_to_tick;
1915 2047
1916 unless ($self->{deny_activate}) { 2048 unless ($self->{deny_activate}) {
1917 $self->decay_objects; 2049 $self->decay_objects;
1918 $self->fix_auto_apply; 2050 $self->fix_auto_apply;
1919 $self->update_buttons; 2051 $self->update_buttons;
1920 Coro::cede; 2052 cf::cede_to_tick;
1921 $self->set_darkness_map;
1922 Coro::cede;
1923 $self->activate; 2053 $self->activate;
1924 } 2054 }
1925 2055
1926 $self->{last_save} = $cf::RUNTIME; 2056 $self->{last_save} = $cf::RUNTIME;
1927 $self->last_access ($cf::RUNTIME); 2057 $self->last_access ($cf::RUNTIME);
1928 2058
1929 $self->in_memory (cf::MAP_IN_MEMORY); 2059 $self->in_memory (cf::MAP_ACTIVE);
1930 } 2060 }
1931 2061
1932 $self->post_load; 2062 $self->post_load;
1933} 2063}
1934 2064
… …
1943 2073
1944 $self 2074 $self
1945} 2075}
1946 2076
1947# 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
1948sub load_diag { 2078sub load_neighbours {
1949 my ($map) = @_; 2079 my ($map) = @_;
1950 2080
1951 my @diag; # diagonal neighbours 2081 my @neigh; # diagonal neighbours
1952 2082
1953 for (0 .. 3) { 2083 for (0 .. 3) {
1954 my $neigh = $map->tile_path ($_) 2084 my $neigh = $map->tile_path ($_)
1955 or next; 2085 or next;
1956 $neigh = find $neigh, $map 2086 $neigh = find $neigh, $map
1957 or next; 2087 or next;
1958 $neigh->load; 2088 $neigh->load;
1959 2089
2090 push @neigh,
1960 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2091 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1961 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2092 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1962 } 2093 }
1963 2094
1964 for (@diag) { 2095 for (grep defined $_->[0], @neigh) {
2096 my ($path, $origin) = @$_;
1965 my $neigh = find @$_ 2097 my $neigh = find $path, $origin
1966 or next; 2098 or next;
1967 $neigh->load; 2099 $neigh->load;
1968 } 2100 }
1969} 2101}
1970 2102
… …
1975} 2107}
1976 2108
1977sub do_load_sync { 2109sub do_load_sync {
1978 my ($map) = @_; 2110 my ($map) = @_;
1979 2111
2112 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2113 if $Coro::current == $Coro::main;
2114
1980 cf::sync_job { $map->load }; 2115 cf::sync_job { $map->load };
1981} 2116}
1982 2117
1983our %MAP_PREFETCH; 2118our %MAP_PREFETCH;
1984our $MAP_PREFETCHER = undef; 2119our $MAP_PREFETCHER = undef;
1985 2120
1986sub find_async { 2121sub find_async {
1987 my ($path, $origin) = @_; 2122 my ($path, $origin, $load) = @_;
1988 2123
1989 $path = normalise $path, $origin && $origin->{path}; 2124 $path = normalise $path, $origin && $origin->{path};
1990 2125
1991 if (my $map = $cf::MAP{$path}) { 2126 if (my $map = $cf::MAP{$path}) {
1992 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2127 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1993 } 2128 }
1994 2129
1995 undef $MAP_PREFETCH{$path}; 2130 $MAP_PREFETCH{$path} |= $load;
2131
1996 $MAP_PREFETCHER ||= cf::async { 2132 $MAP_PREFETCHER ||= cf::async {
2133 $Coro::current->{desc} = "map prefetcher";
2134
1997 while (%MAP_PREFETCH) { 2135 while (%MAP_PREFETCH) {
1998 for my $path (keys %MAP_PREFETCH) { 2136 while (my ($k, $v) = each %MAP_PREFETCH) {
1999 if (my $map = find $path) { 2137 if (my $map = find $k) {
2000 $map->load; 2138 $map->load if $v;
2001 } 2139 }
2002 2140
2003 delete $MAP_PREFETCH{$path}; 2141 delete $MAP_PREFETCH{$k};
2004 } 2142 }
2005 } 2143 }
2006 undef $MAP_PREFETCHER; 2144 undef $MAP_PREFETCHER;
2007 }; 2145 };
2008 $MAP_PREFETCHER->prio (6); 2146 $MAP_PREFETCHER->prio (6);
… …
2011} 2149}
2012 2150
2013sub save { 2151sub save {
2014 my ($self) = @_; 2152 my ($self) = @_;
2015 2153
2016 my $lock = cf::lock_acquire "map_data:" . $self->path; 2154 my $lock = cf::lock_acquire "map_data:$self->{path}";
2017 2155
2018 $self->{last_save} = $cf::RUNTIME; 2156 $self->{last_save} = $cf::RUNTIME;
2019 2157
2020 return unless $self->dirty; 2158 return unless $self->dirty;
2021 2159
… …
2027 return if $self->{deny_save}; 2165 return if $self->{deny_save};
2028 2166
2029 local $self->{last_access} = $self->last_access;#d# 2167 local $self->{last_access} = $self->last_access;#d#
2030 2168
2031 cf::async { 2169 cf::async {
2170 $Coro::current->{desc} = "map player save";
2032 $_->contr->save for $self->players; 2171 $_->contr->save for $self->players;
2033 }; 2172 };
2173
2174 cf::get_slot 0.02;
2034 2175
2035 if ($uniq) { 2176 if ($uniq) {
2036 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2177 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2037 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2178 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2038 } else { 2179 } else {
… …
2044 my ($self) = @_; 2185 my ($self) = @_;
2045 2186
2046 # save first because save cedes 2187 # save first because save cedes
2047 $self->save; 2188 $self->save;
2048 2189
2049 my $lock = cf::lock_acquire "map_data:" . $self->path; 2190 my $lock = cf::lock_acquire "map_data:$self->{path}";
2050 2191
2051 return if $self->players; 2192 return if $self->players;
2052 return if $self->in_memory != cf::MAP_IN_MEMORY; 2193 return if $self->in_memory != cf::MAP_ACTIVE;
2053 return if $self->{deny_save}; 2194 return if $self->{deny_save};
2054 2195
2196 $self->in_memory (cf::MAP_SWAPPED);
2197
2198 $self->deactivate;
2199 $_->clear_links_to ($self) for values %cf::MAP;
2055 $self->clear; 2200 $self->clear;
2056 $self->in_memory (cf::MAP_SWAPPED);
2057} 2201}
2058 2202
2059sub reset_at { 2203sub reset_at {
2060 my ($self) = @_; 2204 my ($self) = @_;
2061 2205
… …
2093 if $uniq; 2237 if $uniq;
2094 } 2238 }
2095 2239
2096 delete $cf::MAP{$self->path}; 2240 delete $cf::MAP{$self->path};
2097 2241
2242 $self->deactivate;
2243 $_->clear_links_to ($self) for values %cf::MAP;
2098 $self->clear; 2244 $self->clear;
2099
2100 $_->clear_links_to ($self) for values %cf::MAP;
2101 2245
2102 $self->unlink_save; 2246 $self->unlink_save;
2103 $self->destroy; 2247 $self->destroy;
2104} 2248}
2105 2249
2106my $nuke_counter = "aaaa"; 2250my $nuke_counter = "aaaa";
2107 2251
2108sub nuke { 2252sub nuke {
2109 my ($self) = @_; 2253 my ($self) = @_;
2110 2254
2255 {
2256 my $lock = cf::lock_acquire "map_data:$self->{path}";
2257
2111 delete $cf::MAP{$self->path}; 2258 delete $cf::MAP{$self->path};
2112 2259
2113 $self->unlink_save; 2260 $self->unlink_save;
2114 2261
2115 bless $self, "cf::map"; 2262 bless $self, "cf::map";
2116 delete $self->{deny_reset}; 2263 delete $self->{deny_reset};
2117 $self->{deny_save} = 1; 2264 $self->{deny_save} = 1;
2118 $self->reset_timeout (1); 2265 $self->reset_timeout (1);
2119 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2266 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2120 2267
2121 $cf::MAP{$self->path} = $self; 2268 $cf::MAP{$self->path} = $self;
2269 }
2122 2270
2123 $self->reset; # polite request, might not happen 2271 $self->reset; # polite request, might not happen
2124} 2272}
2125 2273
2126=item $maps = cf::map::tmp_maps 2274=item $maps = cf::map::tmp_maps
… …
2168 2316
2169sub unique_maps() { 2317sub unique_maps() {
2170 [ 2318 [
2171 map { 2319 map {
2172 utf8::decode $_; 2320 utf8::decode $_;
2173 /\.map$/ 2321 s/\.map$//; # TODO future compatibility hack
2322 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2323 ? ()
2174 ? normalise $_ 2324 : normalise $_
2175 : ()
2176 } @{ aio_readdir $UNIQUEDIR or [] } 2325 } @{ aio_readdir $UNIQUEDIR or [] }
2177 ] 2326 ]
2178} 2327}
2179 2328
2180package cf;
2181
2182=back 2329=back
2183 2330
2184=head3 cf::object 2331=head3 cf::object
2185 2332
2186=cut 2333=cut
… …
2189 2336
2190=over 4 2337=over 4
2191 2338
2192=item $ob->inv_recursive 2339=item $ob->inv_recursive
2193 2340
2194Returns 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.
2195 2343
2196=cut 2344=cut
2197 2345
2198sub inv_recursive_; 2346sub inv_recursive_;
2199sub inv_recursive_ { 2347sub inv_recursive_ {
… …
2202 2350
2203sub inv_recursive { 2351sub inv_recursive {
2204 inv_recursive_ inv $_[0] 2352 inv_recursive_ inv $_[0]
2205} 2353}
2206 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
2207package cf; 2383package cf;
2208 2384
2209=back 2385=back
2210 2386
2211=head3 cf::object::player 2387=head3 cf::object::player
… …
2217Sends 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>
2218can 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
2219dialogue with the given NPC character. 2395dialogue with the given NPC character.
2220 2396
2221=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};
2222 2412
2223# rough implementation of a future "reply" method that works 2413# rough implementation of a future "reply" method that works
2224# with dialog boxes. 2414# with dialog boxes.
2225#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
2226sub cf::object::player::reply($$$;$) { 2416sub cf::object::player::reply($$$;$) {
… …
2238 my $dialog = $pl->{npc_dialog}; 2428 my $dialog = $pl->{npc_dialog};
2239 $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));
2240 2430
2241 } else { 2431 } else {
2242 $msg = $npc->name . " says: $msg" if $npc; 2432 $msg = $npc->name . " says: $msg" if $npc;
2243 $self->message ($msg, $flags); 2433 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2244 } 2434 }
2245 } 2435 }
2436}
2437
2438=item $object->send_msg ($channel, $msg, $color, [extra...])
2439
2440=cut
2441
2442sub cf::object::send_msg {
2443 my $pl = shift->contr
2444 or return;
2445 $pl->send_msg (@_);
2246} 2446}
2247 2447
2248=item $player_object->may ("access") 2448=item $player_object->may ("access")
2249 2449
2250Returns wether the given player is authorized to access resource "access" 2450Returns wether the given player is authorized to access resource "access"
… …
2263 2463
2264=item $player_object->enter_link 2464=item $player_object->enter_link
2265 2465
2266Freezes 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}>).
2267 2467
2268The 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.
2269I<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.
2270 2472
2271Will never block. 2473Will never block.
2272 2474
2273=item $player_object->leave_link ($map, $x, $y) 2475=item $player_object->leave_link ($map, $x, $y)
2274 2476
… …
2329 # use -1 or undef as default coordinates, not 0, 0 2531 # use -1 or undef as default coordinates, not 0, 0
2330 ($x, $y) = ($map->enter_x, $map->enter_y) 2532 ($x, $y) = ($map->enter_x, $map->enter_y)
2331 if $x <=0 && $y <= 0; 2533 if $x <=0 && $y <= 0;
2332 2534
2333 $map->load; 2535 $map->load;
2334 $map->load_diag; 2536 $map->load_neighbours;
2335 2537
2336 return unless $self->contr->active; 2538 return unless $self->contr->active;
2539 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2337 $self->activate_recursive; 2540 $self->activate_recursive;
2338 2541
2339 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2542 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2340 $self->enter_map ($map, $x, $y); 2543 $self->enter_map ($map, $x, $y);
2341} 2544}
… …
2346her, loading and preparing them map, calling the provided $check callback 2549her, loading and preparing them map, calling the provided $check callback
2347that 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
2348the 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
2349be called at the end of this process. 2552be called at the end of this process.
2350 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
2351=cut 2557=cut
2352 2558
2353our $GOTOGEN; 2559our $GOTOGEN;
2354 2560
2355sub cf::object::player::goto { 2561sub cf::object::player::goto {
… …
2359 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2565 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2360 2566
2361 $self->enter_link; 2567 $self->enter_link;
2362 2568
2363 (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
2364 my $map = eval { 2591 my $map = eval {
2365 my $map = cf::map::find $path; 2592 my $map = defined $path ? cf::map::find $path : undef;
2366 2593
2367 if ($map) { 2594 if ($map) {
2368 $map = $map->customise_for ($self); 2595 $map = $map->customise_for ($self);
2369 $map = $check->($map) if $check && $map; 2596 $map = $check->($map) if $check && $map;
2370 } else { 2597 } else {
2371 $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);
2372 } 2599 }
2373 2600
2374 $map 2601 $map
2375 }; 2602 };
2376 2603
… …
2412} 2639}
2413 2640
2414sub prepare_random_map { 2641sub prepare_random_map {
2415 my ($exit) = @_; 2642 my ($exit) = @_;
2416 2643
2417 my $guard = cf::lock_acquire "exit_prepare:$exit";
2418
2419 # all this does is basically replace the /! path by 2644 # all this does is basically replace the /! path by
2420 # a new random map path (?random/...) with a seed 2645 # a new random map path (?random/...) with a seed
2421 # that depends on the exit object 2646 # that depends on the exit object
2422 2647
2423 my $rmp = parse_random_map_params $exit->msg; 2648 my $rmp = parse_random_map_params $exit->msg;
… …
2425 if ($exit->map) { 2650 if ($exit->map) {
2426 $rmp->{region} = $exit->region->name; 2651 $rmp->{region} = $exit->region->name;
2427 $rmp->{origin_map} = $exit->map->path; 2652 $rmp->{origin_map} = $exit->map->path;
2428 $rmp->{origin_x} = $exit->x; 2653 $rmp->{origin_x} = $exit->x;
2429 $rmp->{origin_y} = $exit->y; 2654 $rmp->{origin_y} = $exit->y;
2655
2656 $exit->map->touch;
2430 } 2657 }
2431 2658
2432 $rmp->{random_seed} ||= $exit->random_seed; 2659 $rmp->{random_seed} ||= $exit->random_seed;
2433 2660
2434 my $data = cf::to_json $rmp; 2661 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2435 my $md5 = Digest::MD5::md5_hex $data; 2662 my $md5 = Digest::MD5::md5_hex $data;
2436 my $meta = "$RANDOMDIR/$md5.meta"; 2663 my $meta = "$RANDOMDIR/$md5.meta";
2437 2664
2438 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2665 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2439 aio_write $fh, 0, (length $data), $data, 0; 2666 aio_write $fh, 0, (length $data), $data, 0;
2440 undef $fh; 2667 undef $fh;
2441 aio_rename "$meta~", $meta; 2668 aio_rename "$meta~", $meta;
2442 2669
2670 my $slaying = "?random/$md5";
2671
2672 if ($exit->valid) {
2443 $exit->slaying ("?random/$md5"); 2673 $exit->slaying ("?random/$md5");
2444 $exit->msg (undef); 2674 $exit->msg (undef);
2675 }
2445 } 2676 }
2446} 2677}
2447 2678
2448sub cf::object::player::enter_exit { 2679sub cf::object::player::enter_exit {
2449 my ($self, $exit) = @_; 2680 my ($self, $exit) = @_;
2450 2681
2451 return unless $self->type == cf::PLAYER; 2682 return unless $self->type == cf::PLAYER;
2452 2683
2453 if ($exit->slaying eq "/!") {
2454 #TODO: this should de-fi-ni-te-ly not be a sync-job
2455 # the problem is that $exit might not survive long enough
2456 # so it needs to be done right now, right here
2457 cf::sync_job { prepare_random_map $exit };
2458 }
2459
2460 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2461 my $hp = $exit->stats->hp;
2462 my $sp = $exit->stats->sp;
2463
2464 $self->enter_link; 2684 $self->enter_link;
2465 2685
2466 # if exit is damned, update players death & WoR home-position
2467 $self->contr->savebed ($slaying, $hp, $sp)
2468 if $exit->flag (FLAG_DAMNED);
2469
2470 (async { 2686 (async {
2471 $self->deactivate_recursive; # just to be sure 2687 $Coro::current->{desc} = "enter_exit";
2688
2472 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
2473 $self->goto ($slaying, $hp, $sp); 2704 $self->goto ($map, $x, $y);
2474 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
2475 1; 2710 1
2476 }) { 2711 }) {
2477 $self->message ("Something went wrong deep within the crossfire server. " 2712 $self->message ("Something went wrong deep within the deliantra server. "
2478 . "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. "
2479 . "Please report this to the dungeon master!", 2714 . "Please report this to the dungeon master!",
2480 cf::NDI_UNIQUE | cf::NDI_RED); 2715 cf::NDI_UNIQUE | cf::NDI_RED);
2481 2716
2482 warn "ERROR in enter_exit: $@"; 2717 warn "ERROR in enter_exit: $@";
… …
2510the 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
2511the message unless the client supports the msg packet. 2746the message unless the client supports the msg packet.
2512 2747
2513=cut 2748=cut
2514 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
2515sub cf::client::send_msg { 2852sub cf::client::send_msg {
2516 my ($self, $channel, $msg, $color, @extra) = @_; 2853 my ($self, $channel, $msg, $color, @extra) = @_;
2517 2854
2518 $msg = $self->pl->expand_cfpod ($msg); 2855 $msg = $self->pl->expand_cfpod ($msg)
2856 unless $color & cf::NDI_VERBATIM;
2519 2857
2520 $color &= cf::NDI_CLIENT_MASK; # just in case... 2858 $color &= cf::NDI_CLIENT_MASK; # just in case...
2521 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
2522 if (ref $channel) { 2867 } elsif (ref $channel) {
2523 # send meta info to client, if not yet sent 2868 # send meta info to client, if not yet sent
2524 unless (exists $self->{channel}{$channel->{id}}) { 2869 unless (exists $self->{channel}{$channel->{id}}) {
2525 $self->{channel}{$channel->{id}} = $channel; 2870 $self->{channel}{$channel->{id}} = $channel;
2526 $self->ext_msg (channel_info => $channel); 2871 $self->ext_msg (channel_info => $channel);
2527 } 2872 }
… …
2529 $channel = $channel->{id}; 2874 $channel = $channel->{id};
2530 } 2875 }
2531 2876
2532 return unless @extra || length $msg; 2877 return unless @extra || length $msg;
2533 2878
2534 if ($self->can_msg) {
2535 # default colour, mask it out 2879 # default colour, mask it out
2536 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2880 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2537 if $color & cf::NDI_DEF; 2881 if $color & cf::NDI_DEF;
2538 2882
2539 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2883 my $pkt = "msg "
2884 . $self->{json_coder}->encode (
2540 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2885 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2541 } else { 2886 );
2542 if ($color >= 0) {
2543 # replace some tags by gcfclient-compatible ones
2544 for ($msg) {
2545 1 while
2546 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2547 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2548 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2549 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2550 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2551 }
2552 2887
2553 $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};
2554 2891
2555 if (0 && $msg =~ /\[/) { 2892 # split very large packets
2556 $self->send_packet ("drawextinfo $color 4 0 $msg") 2893 if (8192 < length $pkt and $self->{can_lzf}) {
2557 } else { 2894 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2558 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2895 $pkt = "frag";
2559 $self->send_packet ("drawinfo $color $msg")
2560 }
2561 }
2562 } 2896 }
2897
2898 $self->send_packet ($pkt);
2563} 2899}
2564 2900
2565=item $client->ext_msg ($type, @msg) 2901=item $client->ext_msg ($type, @msg)
2566 2902
2567Sends an ext event to the client. 2903Sends an ext event to the client.
… …
2569=cut 2905=cut
2570 2906
2571sub cf::client::ext_msg($$@) { 2907sub cf::client::ext_msg($$@) {
2572 my ($self, $type, @msg) = @_; 2908 my ($self, $type, @msg) = @_;
2573 2909
2574 my $extcmd = $self->extcmd;
2575
2576 if ($extcmd == 2) { 2910 if ($self->extcmd == 2) {
2577 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2911 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2578 } elsif ($extcmd == 1) { # TODO: remove 2912 } elsif ($self->extcmd == 1) { # TODO: remove
2579 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;
2580 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2932 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2581 } 2933 }
2582} 2934}
2583 2935
2584=item $success = $client->query ($flags, "text", \&cb) 2936=item $success = $client->query ($flags, "text", \&cb)
… …
2646 my ($type, $reply, @payload) = 2998 my ($type, $reply, @payload) =
2647 "ARRAY" eq ref $msg 2999 "ARRAY" eq ref $msg
2648 ? @$msg 3000 ? @$msg
2649 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 3001 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2650 3002
3003 my @reply;
3004
2651 if (my $cb = $EXTICMD{$type}) { 3005 if (my $cb = $EXTICMD{$type}) {
2652 my @reply = $cb->($ns, @payload); 3006 @reply = $cb->($ns, @payload);
2653
2654 $ns->ext_reply ($reply, @reply)
2655 if $reply;
2656 } 3007 }
3008
3009 $ns->ext_reply ($reply, @reply)
3010 if $reply;
3011
2657 } else { 3012 } else {
2658 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";
2659 } 3014 }
2660 3015
2661 cf::override; 3016 cf::override;
… …
2708our $safe = new Safe "safe"; 3063our $safe = new Safe "safe";
2709our $safe_hole = new Safe::Hole; 3064our $safe_hole = new Safe::Hole;
2710 3065
2711$SIG{FPE} = 'IGNORE'; 3066$SIG{FPE} = 'IGNORE';
2712 3067
2713$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3068$safe->permit_only (Opcode::opset qw(
3069 :base_core :base_mem :base_orig :base_math
3070 grepstart grepwhile mapstart mapwhile
3071 sort time
3072));
2714 3073
2715# here we export the classes and methods available to script code 3074# here we export the classes and methods available to script code
2716 3075
2717=pod 3076=pod
2718 3077
2719The following functions and methods are available within a safe environment: 3078The following functions and methods are available within a safe environment:
2720 3079
2721 cf::object 3080 cf::object
2722 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
2723 insert remove 3082 insert remove name archname title slaying race decrease split
3083 value
2724 3084
2725 cf::object::player 3085 cf::object::player
2726 player 3086 player
2727 3087
2728 cf::player 3088 cf::player
… …
2733 3093
2734=cut 3094=cut
2735 3095
2736for ( 3096for (
2737 ["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
2738 insert remove)], 3098 insert remove inv nrof name archname title slaying race
3099 decrease split destroy change_exp value msg lore send_msg)],
2739 ["cf::object::player" => qw(player)], 3100 ["cf::object::player" => qw(player)],
2740 ["cf::player" => qw(peaceful)], 3101 ["cf::player" => qw(peaceful send_msg)],
2741 ["cf::map" => qw(trigger)], 3102 ["cf::map" => qw(trigger)],
2742) { 3103) {
2743 no strict 'refs'; 3104 no strict 'refs';
2744 my ($pkg, @funs) = @$_; 3105 my ($pkg, @funs) = @$_;
2745 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3106 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
2762 my ($code, %vars) = @_; 3123 my ($code, %vars) = @_;
2763 3124
2764 my $qcode = $code; 3125 my $qcode = $code;
2765 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2766 $qcode =~ s/\n/\\n/g; 3127 $qcode =~ s/\n/\\n/g;
3128
3129 %vars = (_dummy => 0) unless %vars;
2767 3130
2768 local $_; 3131 local $_;
2769 local @safe::cf::_safe_eval_args = values %vars; 3132 local @safe::cf::_safe_eval_args = values %vars;
2770 3133
2771 my $eval = 3134 my $eval =
… …
2819# the server's init and main functions 3182# the server's init and main functions
2820 3183
2821sub load_facedata($) { 3184sub load_facedata($) {
2822 my ($path) = @_; 3185 my ($path) = @_;
2823 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
2824 warn "loading facedata from $path\n"; 3193 warn "loading facedata from $path\n";
2825 3194
2826 my $facedata; 3195 my $facedata;
2827 0 < aio_load $path, $facedata 3196 0 < aio_load $path, $facedata
2828 or die "$path: $!"; 3197 or die "$path: $!";
… …
2830 $facedata = Coro::Storable::thaw $facedata; 3199 $facedata = Coro::Storable::thaw $facedata;
2831 3200
2832 $facedata->{version} == 2 3201 $facedata->{version} == 2
2833 or cf::cleanup "$path: version mismatch, cannot proceed."; 3202 or cf::cleanup "$path: version mismatch, cannot proceed.";
2834 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
2835 { 3211 {
2836 my $faces = $facedata->{faceinfo}; 3212 my $faces = $facedata->{faceinfo};
2837 3213
2838 while (my ($face, $info) = each %$faces) { 3214 while (my ($face, $info) = each %$faces) {
2839 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3215 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3216
2840 cf::face::set_visibility $idx, $info->{visibility}; 3217 cf::face::set_visibility $idx, $info->{visibility};
2841 cf::face::set_magicmap $idx, $info->{magicmap}; 3218 cf::face::set_magicmap $idx, $info->{magicmap};
2842 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3219 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2843 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3220 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2844 3221
2845 cf::cede_to_tick; 3222 cf::cede_to_tick;
2846 } 3223 }
2847 3224
2848 while (my ($face, $info) = each %$faces) { 3225 while (my ($face, $info) = each %$faces) {
2849 next unless $info->{smooth}; 3226 next unless $info->{smooth};
3227
2850 my $idx = cf::face::find $face 3228 my $idx = cf::face::find $face
2851 or next; 3229 or next;
3230
2852 if (my $smooth = cf::face::find $info->{smooth}) { 3231 if (my $smooth = cf::face::find $info->{smooth}) {
2853 cf::face::set_smooth $idx, $smooth; 3232 cf::face::set_smooth $idx, $smooth;
2854 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3233 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2855 } else { 3234 } else {
2856 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3235 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
2873 3252
2874 { 3253 {
2875 # TODO: for gcfclient pleasure, we should give resources 3254 # TODO: for gcfclient pleasure, we should give resources
2876 # that gcfclient doesn't grok a >10000 face index. 3255 # that gcfclient doesn't grok a >10000 face index.
2877 my $res = $facedata->{resource}; 3256 my $res = $facedata->{resource};
2878 my $enc = JSON::XS->new->utf8->canonical;
2879
2880 my $soundconf = delete $res->{"res/sound.conf"};
2881 3257
2882 while (my ($name, $info) = each %$res) { 3258 while (my ($name, $info) = each %$res) {
2883 my $meta = $enc->encode ({ 3259 if (defined $info->{type}) {
2884 name => $name,
2885 %{ $info->{meta} || {} },
2886 });
2887
2888 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3260 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3261 my $data;
2889 3262
2890 if ($info->{type} & 1) { 3263 if ($info->{type} & 1) {
2891 # prepend meta info 3264 # prepend meta info
2892 3265
3266 my $meta = $enc->encode ({
3267 name => $name,
3268 %{ $info->{meta} || {} },
3269 });
3270
2893 my $data = pack "(w/a*)*", $meta, $info->{data}; 3271 $data = pack "(w/a*)*", $meta, $info->{data};
2894 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata 3272 } else {
3273 $data = $info->{data};
3274 }
2895 3275
2896 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};
2897 } else { 3278 } else {
2898 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3279 $RESOURCE{$name} = $info;
2899 } 3280 }
2900 3281
2901 cf::face::set_type $idx, $info->{type};
2902
2903 cf::cede_to_tick; 3282 cf::cede_to_tick;
2904 } 3283 }
2905
2906 if ($soundconf) {
2907 $soundconf = $enc->decode (delete $soundconf->{data});
2908
2909 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2910 my $sound = $soundconf->{compat}[$_]
2911 or next;
2912
2913 my $face = cf::face::find "sound/$sound->[1]";
2914 cf::sound::set $sound->[0] => $face;
2915 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2916 }
2917
2918 while (my ($k, $v) = each %{$soundconf->{event}}) {
2919 my $face = cf::face::find "sound/$v";
2920 cf::sound::set $k => $face;
2921 }
2922 }
2923 } 3284 }
3285
3286 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2924 3287
2925 1 3288 1
2926} 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});
2927 3310
2928register_exticmd fx_want => sub { 3311register_exticmd fx_want => sub {
2929 my ($ns, $want) = @_; 3312 my ($ns, $want) = @_;
2930 3313
2931 while (my ($k, $v) = each %$want) { 3314 while (my ($k, $v) = each %$want) {
2932 $ns->fx_want ($k, $v); 3315 $ns->fx_want ($k, $v);
2933 } 3316 }
2934}; 3317};
2935 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
2936sub 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
2937 load_resource_file "$MAPDIR/regions" 3334 load_resource_file "$MAPDIR/regions"
2938 or die "unable to load regions file\n"; 3335 or die "unable to load regions file\n";
2939 3336
2940 for (cf::region::list) { 3337 for (cf::region::list) {
2941 $_->{match} = qr/$_->{match}/ 3338 $_->{match} = qr/$_->{match}/
… …
2949} 3346}
2950 3347
2951sub reload_archetypes { 3348sub reload_archetypes {
2952 load_resource_file "$DATADIR/archetypes" 3349 load_resource_file "$DATADIR/archetypes"
2953 or die "unable to load archetypes\n"; 3350 or die "unable to load archetypes\n";
2954 #d# NEED to laod twice to resolve forward references
2955 # this really needs to be done in an extra post-pass
2956 # (which needs to be synchronous, so solve it differently)
2957 load_resource_file "$DATADIR/archetypes"
2958 or die "unable to load archetypes\n";
2959} 3351}
2960 3352
2961sub reload_treasures { 3353sub reload_treasures {
2962 load_resource_file "$DATADIR/treasures" 3354 load_resource_file "$DATADIR/treasures"
2963 or die "unable to load treasurelists\n"; 3355 or die "unable to load treasurelists\n";
2964} 3356}
2965 3357
2966sub reload_resources { 3358sub reload_resources {
2967 warn "reloading resource files...\n"; 3359 warn "reloading resource files...\n";
2968 3360
3361 reload_facedata;
3362 reload_archetypes;
2969 reload_regions; 3363 reload_regions;
2970 reload_facedata;
2971 #reload_archetypes;#d#
2972 reload_archetypes;
2973 reload_treasures; 3364 reload_treasures;
2974 3365
2975 warn "finished reloading resource files\n"; 3366 warn "finished reloading resource files\n";
2976} 3367}
2977 3368
2978sub init { 3369sub reload_config {
2979 reload_resources;
2980}
2981
2982sub cfg_load {
2983 open my $fh, "<:utf8", "$CONFDIR/config" 3370 open my $fh, "<:utf8", "$CONFDIR/config"
2984 or return; 3371 or return;
2985 3372
2986 local $/; 3373 local $/;
2987 *CFG = YAML::Syck::Load <$fh>; 3374 *CFG = YAML::Load <$fh>;
2988 3375
2989 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3376 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2990 3377
2991 $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};
2992 $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};
… …
2998 }; 3385 };
2999 warn $@ if $@; 3386 warn $@ if $@;
3000 } 3387 }
3001} 3388}
3002 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
3003sub 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
3004 # we must not ever block the main coroutine 3433 # we must not ever block the main coroutine
3005 local $Coro::idle = sub { 3434 local $Coro::idle = sub {
3006 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#
3007 (async { 3436 (async {
3008 Event::one_event; 3437 $Coro::current->{desc} = "IDLE BUG HANDLER";
3438 EV::loop EV::LOOP_ONESHOT;
3009 })->prio (Coro::PRIO_MAX); 3439 })->prio (Coro::PRIO_MAX);
3010 }; 3440 };
3011 3441
3012 cfg_load; 3442 evthread_start IO::AIO::poll_fileno;
3443
3444 cf::sync_job {
3445 reload_resources;
3446 reload_config;
3013 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
3014 load_extensions; 3460 load_extensions;
3015 3461
3016 $TICK_WATCHER->start; 3462 utime time, time, $RUNTIMEFILE;
3017 Event::loop; 3463
3464 # no (long-running) fork's whatsoever before this point(!)
3465 use POSIX ();
3466 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3467
3468 (pop @POST_INIT)->(0) while @POST_INIT;
3469 };
3470
3471 main_loop;
3018} 3472}
3019 3473
3020############################################################################# 3474#############################################################################
3021# initialisation and cleanup 3475# initialisation and cleanup
3022 3476
3023# install some emergency cleanup handlers 3477# install some emergency cleanup handlers
3024BEGIN { 3478BEGIN {
3479 our %SIGWATCHER = ();
3025 for my $signal (qw(INT HUP TERM)) { 3480 for my $signal (qw(INT HUP TERM)) {
3026 Event->signal ( 3481 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3027 reentrant => 0,
3028 data => WF_AUTOCANCEL,
3029 signal => $signal,
3030 prio => 0,
3031 cb => sub {
3032 cf::cleanup "SIG$signal"; 3482 cf::cleanup "SIG$signal";
3033 },
3034 ); 3483 };
3035 } 3484 }
3036} 3485}
3037 3486
3038sub write_runtime { 3487sub write_runtime_sync {
3039 my $runtime = "$LOCALDIR/runtime";
3040
3041 # first touch the runtime file to show we are still running: 3488 # first touch the runtime file to show we are still running:
3042 # the fsync below can take a very very long time. 3489 # the fsync below can take a very very long time.
3043 3490
3044 IO::AIO::aio_utime $runtime, undef, undef; 3491 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3045 3492
3046 my $guard = cf::lock_acquire "write_runtime"; 3493 my $guard = cf::lock_acquire "write_runtime";
3047 3494
3048 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3495 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3049 or return; 3496 or return;
3050 3497
3051 my $value = $cf::RUNTIME + 90 + 10; 3498 my $value = $cf::RUNTIME + 90 + 10;
3052 # 10 is the runtime save interval, for a monotonic clock 3499 # 10 is the runtime save interval, for a monotonic clock
3053 # 60 allows for the watchdog to kill the server. 3500 # 60 allows for the watchdog to kill the server.
… …
3063 aio_utime $fh, undef, undef; 3510 aio_utime $fh, undef, undef;
3064 3511
3065 close $fh 3512 close $fh
3066 or return; 3513 or return;
3067 3514
3068 aio_rename "$runtime~", $runtime 3515 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3069 and return; 3516 and return;
3070 3517
3071 warn "runtime file written.\n"; 3518 warn "runtime file written.\n";
3072 3519
3073 1 3520 1
3521}
3522
3523our $uuid_lock;
3524our $uuid_skip;
3525
3526sub write_uuid_sync($) {
3527 $uuid_skip ||= $_[0];
3528
3529 return if $uuid_lock;
3530 local $uuid_lock = 1;
3531
3532 my $uuid = "$LOCALDIR/uuid";
3533
3534 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3535 or return;
3536
3537 my $value = uuid_seq uuid_cur;
3538
3539 unless ($value) {
3540 warn "cowardly refusing to write zero uuid value!\n";
3541 return;
3542 }
3543
3544 my $value = uuid_str $value + $uuid_skip;
3545 $uuid_skip = 0;
3546
3547 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3548 and return;
3549
3550 # always fsync - this file is important
3551 aio_fsync $fh
3552 and return;
3553
3554 close $fh
3555 or return;
3556
3557 aio_rename "$uuid~", $uuid
3558 and return;
3559
3560 warn "uuid file written ($value).\n";
3561
3562 1
3563
3564}
3565
3566sub write_uuid($$) {
3567 my ($skip, $sync) = @_;
3568
3569 $sync ? write_uuid_sync $skip
3570 : async { write_uuid_sync $skip };
3074} 3571}
3075 3572
3076sub emergency_save() { 3573sub emergency_save() {
3077 my $freeze_guard = cf::freeze_mainloop; 3574 my $freeze_guard = cf::freeze_mainloop;
3078 3575
3079 warn "enter emergency perl save\n"; 3576 warn "emergency_perl_save: enter\n";
3080 3577
3081 cf::sync_job { 3578 cf::sync_job {
3579 # this is a trade-off: we want to be very quick here, so
3580 # save all maps without fsync, and later call a global sync
3581 # (which in turn might be very very slow)
3582 local $USE_FSYNC = 0;
3583
3082 # use a peculiar iteration method to avoid tripping on perl 3584 # use a peculiar iteration method to avoid tripping on perl
3083 # refcount bugs in for. also avoids problems with players 3585 # refcount bugs in for. also avoids problems with players
3084 # and maps saved/destroyed asynchronously. 3586 # and maps saved/destroyed asynchronously.
3085 warn "begin emergency player save\n"; 3587 warn "emergency_perl_save: begin player save\n";
3086 for my $login (keys %cf::PLAYER) { 3588 for my $login (keys %cf::PLAYER) {
3087 my $pl = $cf::PLAYER{$login} or next; 3589 my $pl = $cf::PLAYER{$login} or next;
3088 $pl->valid or next; 3590 $pl->valid or next;
3591 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3089 $pl->save; 3592 $pl->save;
3090 } 3593 }
3091 warn "end emergency player save\n"; 3594 warn "emergency_perl_save: end player save\n";
3092 3595
3093 warn "begin emergency map save\n"; 3596 warn "emergency_perl_save: begin map save\n";
3094 for my $path (keys %cf::MAP) { 3597 for my $path (keys %cf::MAP) {
3095 my $map = $cf::MAP{$path} or next; 3598 my $map = $cf::MAP{$path} or next;
3096 $map->valid or next; 3599 $map->valid or next;
3097 $map->save; 3600 $map->save;
3098 } 3601 }
3099 warn "end emergency map save\n"; 3602 warn "emergency_perl_save: end map save\n";
3100 3603
3101 warn "begin emergency database checkpoint\n"; 3604 warn "emergency_perl_save: begin database checkpoint\n";
3102 BDB::db_env_txn_checkpoint $DB_ENV; 3605 BDB::db_env_txn_checkpoint $DB_ENV;
3103 warn "end emergency database checkpoint\n"; 3606 warn "emergency_perl_save: end database checkpoint\n";
3607
3608 warn "emergency_perl_save: begin write uuid\n";
3609 write_uuid_sync 1;
3610 warn "emergency_perl_save: end write uuid\n";
3104 }; 3611 };
3105 3612
3613 warn "emergency_perl_save: starting sync()\n";
3614 IO::AIO::aio_sync sub {
3615 warn "emergency_perl_save: finished sync()\n";
3616 };
3617
3106 warn "leave emergency perl save\n"; 3618 warn "emergency_perl_save: leave\n";
3107} 3619}
3108 3620
3109sub post_cleanup { 3621sub post_cleanup {
3110 my ($make_core) = @_; 3622 my ($make_core) = @_;
3111 3623
3112 warn Carp::longmess "post_cleanup backtrace" 3624 warn Carp::longmess "post_cleanup backtrace"
3113 if $make_core; 3625 if $make_core;
3626
3627 my $fh = pidfile;
3628 unlink $PIDFILE if <$fh> == $$;
3629}
3630
3631# a safer delete_package, copied from Symbol
3632sub clear_package($) {
3633 my $pkg = shift;
3634
3635 # expand to full symbol table name if needed
3636 unless ($pkg =~ /^main::.*::$/) {
3637 $pkg = "main$pkg" if $pkg =~ /^::/;
3638 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3639 $pkg .= '::' unless $pkg =~ /::$/;
3640 }
3641
3642 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3643 my $stem_symtab = *{$stem}{HASH};
3644
3645 defined $stem_symtab and exists $stem_symtab->{$leaf}
3646 or return;
3647
3648 # clear all symbols
3649 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3650 for my $name (keys %$leaf_symtab) {
3651 _gv_clear *{"$pkg$name"};
3652# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3653 }
3654 warn "cleared package $pkg\n";#d#
3114} 3655}
3115 3656
3116sub do_reload_perl() { 3657sub do_reload_perl() {
3117 # can/must only be called in main 3658 # can/must only be called in main
3118 if ($Coro::current != $Coro::main) { 3659 if ($Coro::current != $Coro::main) {
3119 warn "can only reload from main coroutine"; 3660 warn "can only reload from main coroutine";
3120 return; 3661 return;
3121 } 3662 }
3122 3663
3664 return if $RELOAD++;
3665
3666 my $t1 = EV::time;
3667
3668 while ($RELOAD) {
3123 warn "reloading..."; 3669 warn "reloading...";
3124 3670
3125 warn "entering sync_job"; 3671 warn "entering sync_job";
3126 3672
3127 cf::sync_job { 3673 cf::sync_job {
3128 cf::write_runtime; # external watchdog should not bark 3674 cf::write_runtime_sync; # external watchdog should not bark
3129 cf::emergency_save; 3675 cf::emergency_save;
3130 cf::write_runtime; # external watchdog should not bark 3676 cf::write_runtime_sync; # external watchdog should not bark
3131 3677
3132 warn "syncing database to disk"; 3678 warn "syncing database to disk";
3133 BDB::db_env_txn_checkpoint $DB_ENV; 3679 BDB::db_env_txn_checkpoint $DB_ENV;
3134 3680
3135 # if anything goes wrong in here, we should simply crash as we already saved 3681 # if anything goes wrong in here, we should simply crash as we already saved
3136 3682
3137 warn "cancelling all WF_AUTOCANCEL watchers";
3138 for (Event::all_watchers) {
3139 $_->cancel if $_->data & WF_AUTOCANCEL;
3140 }
3141
3142 warn "flushing outstanding aio requests"; 3683 warn "flushing outstanding aio requests";
3143 for (;;) {
3144 BDB::flush;
3145 IO::AIO::flush;
3146 Coro::cede;
3147 last unless IO::AIO::nreqs || BDB::nreqs; 3684 while (IO::AIO::nreqs || BDB::nreqs) {
3148 warn "iterate..."; 3685 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3149 }
3150
3151 ++$RELOAD;
3152
3153 warn "cancelling all extension coros";
3154 $_->cancel for values %EXT_CORO;
3155 %EXT_CORO = ();
3156
3157 warn "removing commands";
3158 %COMMAND = ();
3159
3160 warn "removing ext/exti commands";
3161 %EXTCMD = ();
3162 %EXTICMD = ();
3163
3164 warn "unloading/nuking all extensions";
3165 for my $pkg (@EXTS) {
3166 warn "... unloading $pkg";
3167
3168 if (my $cb = $pkg->can ("unload")) {
3169 eval {
3170 $cb->($pkg);
3171 1
3172 } or warn "$pkg unloaded, but with errors: $@";
3173 } 3686 }
3174 3687
3175 warn "... nuking $pkg"; 3688 warn "cancelling all extension coros";
3176 Symbol::delete_package $pkg; 3689 $_->cancel for values %EXT_CORO;
3177 } 3690 %EXT_CORO = ();
3178 3691
3179 warn "unloading all perl modules loaded from $LIBDIR"; 3692 warn "removing commands";
3180 while (my ($k, $v) = each %INC) { 3693 %COMMAND = ();
3181 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3182 3694
3695 warn "removing ext/exti commands";
3696 %EXTCMD = ();
3697 %EXTICMD = ();
3698
3699 warn "unloading/nuking all extensions";
3700 for my $pkg (@EXTS) {
3183 warn "... unloading $k"; 3701 warn "... unloading $pkg";
3184 delete $INC{$k};
3185 3702
3186 $k =~ s/\.pm$//;
3187 $k =~ s/\//::/g;
3188
3189 if (my $cb = $k->can ("unload_module")) { 3703 if (my $cb = $pkg->can ("unload")) {
3704 eval {
3190 $cb->(); 3705 $cb->($pkg);
3706 1
3707 } or warn "$pkg unloaded, but with errors: $@";
3708 }
3709
3710 warn "... clearing $pkg";
3711 clear_package $pkg;
3191 } 3712 }
3192 3713
3193 Symbol::delete_package $k; 3714 warn "unloading all perl modules loaded from $LIBDIR";
3715 while (my ($k, $v) = each %INC) {
3716 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3717
3718 warn "... unloading $k";
3719 delete $INC{$k};
3720
3721 $k =~ s/\.pm$//;
3722 $k =~ s/\//::/g;
3723
3724 if (my $cb = $k->can ("unload_module")) {
3725 $cb->();
3726 }
3727
3728 clear_package $k;
3194 } 3729 }
3195 3730
3196 warn "getting rid of safe::, as good as possible"; 3731 warn "getting rid of safe::, as good as possible";
3197 Symbol::delete_package "safe::$_" 3732 clear_package "safe::$_"
3198 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3733 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3199 3734
3200 warn "unloading cf.pm \"a bit\""; 3735 warn "unloading cf.pm \"a bit\"";
3201 delete $INC{"cf.pm"}; 3736 delete $INC{"cf.pm"};
3202 delete $INC{"cf/pod.pm"}; 3737 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3203 3738
3204 # don't, removes xs symbols, too, 3739 # don't, removes xs symbols, too,
3205 # and global variables created in xs 3740 # and global variables created in xs
3206 #Symbol::delete_package __PACKAGE__; 3741 #clear_package __PACKAGE__;
3207 3742
3208 warn "unload completed, starting to reload now"; 3743 warn "unload completed, starting to reload now";
3209 3744
3210 warn "reloading cf.pm"; 3745 warn "reloading cf.pm";
3211 require cf; 3746 require cf;
3212 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3747 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3213 3748
3214 warn "loading config and database again"; 3749 warn "loading config and database again";
3215 cf::cfg_load; 3750 cf::reload_config;
3216 3751
3217 warn "loading extensions"; 3752 warn "loading extensions";
3218 cf::load_extensions; 3753 cf::load_extensions;
3219 3754
3755 if ($REATTACH_ON_RELOAD) {
3220 warn "reattaching attachments to objects/players"; 3756 warn "reattaching attachments to objects/players";
3221 _global_reattach; # objects, sockets 3757 _global_reattach; # objects, sockets
3222 warn "reattaching attachments to maps"; 3758 warn "reattaching attachments to maps";
3223 reattach $_ for values %MAP; 3759 reattach $_ for values %MAP;
3224 warn "reattaching attachments to players"; 3760 warn "reattaching attachments to players";
3225 reattach $_ for values %PLAYER; 3761 reattach $_ for values %PLAYER;
3762 }
3226 3763
3764 warn "running post_init jobs";
3765 (pop @POST_INIT)->(1) while @POST_INIT;
3766
3227 warn "leaving sync_job"; 3767 warn "leaving sync_job";
3228 3768
3229 1 3769 1
3230 } or do { 3770 } or do {
3231 warn $@; 3771 warn $@;
3232 warn "error while reloading, exiting."; 3772 cf::cleanup "error while reloading, exiting.";
3233 exit 1;
3234 }; 3773 };
3235 3774
3236 warn "reloaded"; 3775 warn "reloaded";
3776 --$RELOAD;
3777 }
3778
3779 $t1 = EV::time - $t1;
3780 warn "reload completed in ${t1}s\n";
3237}; 3781};
3238 3782
3239our $RELOAD_WATCHER; # used only during reload 3783our $RELOAD_WATCHER; # used only during reload
3240 3784
3241sub reload_perl() { 3785sub reload_perl() {
3242 # doing reload synchronously and two reloads happen back-to-back, 3786 # doing reload synchronously and two reloads happen back-to-back,
3243 # coro crashes during coro_state_free->destroy here. 3787 # coro crashes during coro_state_free->destroy here.
3244 3788
3245 $RELOAD_WATCHER ||= Event->timer ( 3789 $RELOAD_WATCHER ||= cf::async {
3246 reentrant => 0, 3790 Coro::AIO::aio_wait cache_extensions;
3247 after => 0, 3791
3248 data => WF_AUTOCANCEL, 3792 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3249 cb => sub {
3250 do_reload_perl; 3793 do_reload_perl;
3251 undef $RELOAD_WATCHER; 3794 undef $RELOAD_WATCHER;
3252 }, 3795 };
3253 ); 3796 };
3254} 3797}
3255 3798
3256register_command "reload" => sub { 3799register_command "reload" => sub {
3257 my ($who, $arg) = @_; 3800 my ($who, $arg) = @_;
3258 3801
3259 if ($who->flag (FLAG_WIZ)) { 3802 if ($who->flag (FLAG_WIZ)) {
3260 $who->message ("reloading server."); 3803 $who->message ("reloading server.");
3804 async {
3805 $Coro::current->{desc} = "perl_reload";
3261 async { reload_perl }; 3806 reload_perl;
3807 };
3262 } 3808 }
3263}; 3809};
3264 3810
3265unshift @INC, $LIBDIR; 3811unshift @INC, $LIBDIR;
3266 3812
… …
3268 3814
3269our @WAIT_FOR_TICK; 3815our @WAIT_FOR_TICK;
3270our @WAIT_FOR_TICK_BEGIN; 3816our @WAIT_FOR_TICK_BEGIN;
3271 3817
3272sub wait_for_tick { 3818sub wait_for_tick {
3273 return unless $TICK_WATCHER->is_active;
3274 return if $Coro::current == $Coro::main; 3819 return if tick_inhibit || $Coro::current == $Coro::main;
3275 3820
3276 my $signal = new Coro::Signal; 3821 my $signal = new Coro::Signal;
3277 push @WAIT_FOR_TICK, $signal; 3822 push @WAIT_FOR_TICK, $signal;
3278 $signal->wait; 3823 $signal->wait;
3279} 3824}
3280 3825
3281sub wait_for_tick_begin { 3826sub wait_for_tick_begin {
3282 return unless $TICK_WATCHER->is_active;
3283 return if $Coro::current == $Coro::main; 3827 return if tick_inhibit || $Coro::current == $Coro::main;
3284 3828
3285 my $signal = new Coro::Signal; 3829 my $signal = new Coro::Signal;
3286 push @WAIT_FOR_TICK_BEGIN, $signal; 3830 push @WAIT_FOR_TICK_BEGIN, $signal;
3287 $signal->wait; 3831 $signal->wait;
3288} 3832}
3289 3833
3290 my $min = 1e6;#d# 3834sub tick {
3291 my $avg = 10;
3292$TICK_WATCHER = Event->timer (
3293 reentrant => 0,
3294 parked => 1,
3295 prio => 0,
3296 at => $NEXT_TICK || $TICK,
3297 data => WF_AUTOCANCEL,
3298 cb => sub {
3299 if ($Coro::current != $Coro::main) { 3835 if ($Coro::current != $Coro::main) {
3300 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3836 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3301 unless ++$bug_warning > 10; 3837 unless ++$bug_warning > 10;
3302 return; 3838 return;
3303 } 3839 }
3304 3840
3305 $NOW = $tick_start = Event::time;
3306
3307 cf::server_tick; # one server iteration 3841 cf::server_tick; # one server iteration
3308 3842
3309 0 && sync_job {#d# 3843 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3310 for(1..10) { 3844 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3311 my $t = Event::time; 3845 Coro::async_pool {
3312 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3846 $Coro::current->{desc} = "runtime saver";
3313 or die; 3847 write_runtime_sync
3314 3848 or warn "ERROR: unable to write runtime file: $!";
3315 $map->width (50);
3316 $map->height (50);
3317 $map->alloc;
3318 $map->_load_objects ("/tmp/x.map", 1);
3319 my $t = Event::time - $t;
3320
3321 #next unless $t < 0.0013;#d#
3322 if ($t < $min) {
3323 $min = $t;
3324 }
3325 $avg = $avg * 0.99 + $t * 0.01;
3326 }
3327 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3328 exit 0;
3329 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3330 }; 3849 };
3850 }
3331 3851
3332 $RUNTIME += $TICK;
3333 $NEXT_TICK += $TICK;
3334
3335 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3336 $NEXT_RUNTIME_WRITE = $NOW + 10;
3337 Coro::async_pool {
3338 write_runtime
3339 or warn "ERROR: unable to write runtime file: $!";
3340 };
3341 }
3342
3343# my $AFTER = Event::time;
3344# warn $AFTER - $NOW;#d#
3345
3346 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3852 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3347 $sig->send; 3853 $sig->send;
3348 } 3854 }
3349 while (my $sig = shift @WAIT_FOR_TICK) { 3855 while (my $sig = shift @WAIT_FOR_TICK) {
3350 $sig->send; 3856 $sig->send;
3351 } 3857 }
3352 3858
3353 $NOW = Event::time; 3859 $LOAD = ($NOW - $TICK_START) / $TICK;
3354
3355 # if we are delayed by four ticks or more, skip them all
3356 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3357
3358 $TICK_WATCHER->at ($NEXT_TICK);
3359 $TICK_WATCHER->start;
3360
3361 $LOAD = ($NOW - $tick_start) / $TICK;
3362 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3860 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3363 3861
3364 _post_tick; 3862 if (0) {
3365 3863 if ($NEXT_TICK) {
3366 3864 my $jitter = $TICK_START - $NEXT_TICK;
3865 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3866 warn "jitter $JITTER\n";#d#
3867 }
3367 }, 3868 }
3368); 3869}
3369 3870
3370{ 3871{
3371 BDB::max_poll_time $TICK * 0.1; 3872 # configure BDB
3372 $BDB_POLL_WATCHER = Event->io ( 3873
3373 reentrant => 0,
3374 fd => BDB::poll_fileno,
3375 poll => 'r',
3376 prio => 0,
3377 data => WF_AUTOCANCEL,
3378 cb => \&BDB::poll_cb,
3379 );
3380 BDB::min_parallel 8; 3874 BDB::min_parallel 8;
3381 3875 BDB::max_poll_reqs $TICK * 0.1;
3382 BDB::set_sync_prepare { 3876 $AnyEvent::BDB::WATCHER->priority (1);
3383 my $status;
3384 my $current = $Coro::current;
3385 (
3386 sub {
3387 $status = $!;
3388 $current->ready; undef $current;
3389 },
3390 sub {
3391 Coro::schedule while defined $current;
3392 $! = $status;
3393 },
3394 )
3395 };
3396 3877
3397 unless ($DB_ENV) { 3878 unless ($DB_ENV) {
3398 $DB_ENV = BDB::db_env_create; 3879 $DB_ENV = BDB::db_env_create;
3880 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3881 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3882 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3883 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3884 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3399 3885
3400 cf::sync_job { 3886 cf::sync_job {
3401 eval { 3887 eval {
3402 BDB::db_env_open 3888 BDB::db_env_open
3403 $DB_ENV, 3889 $DB_ENV,
… …
3405 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3891 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3406 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3892 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3407 0666; 3893 0666;
3408 3894
3409 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3895 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3410
3411 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3412 $DB_ENV->set_lk_detect;
3413 }; 3896 };
3414 3897
3415 cf::cleanup "db_env_open(db): $@" if $@; 3898 cf::cleanup "db_env_open(db): $@" if $@;
3416 }; 3899 };
3417 } 3900 }
3901
3902 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3903 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3904 };
3905 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3906 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3907 };
3908 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3909 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3910 };
3418} 3911}
3419 3912
3420{ 3913{
3914 # configure IO::AIO
3915
3421 IO::AIO::min_parallel 8; 3916 IO::AIO::min_parallel 8;
3422
3423 undef $Coro::AIO::WATCHER;
3424 IO::AIO::max_poll_time $TICK * 0.1; 3917 IO::AIO::max_poll_time $TICK * 0.1;
3425 $AIO_POLL_WATCHER = Event->io ( 3918 undef $AnyEvent::AIO::WATCHER;
3426 reentrant => 0,
3427 data => WF_AUTOCANCEL,
3428 fd => IO::AIO::poll_fileno,
3429 poll => 'r',
3430 prio => 6,
3431 cb => \&IO::AIO::poll_cb,
3432 );
3433} 3919}
3434 3920
3435my $_log_backtrace; 3921my $_log_backtrace;
3436 3922
3437sub _log_backtrace { 3923sub _log_backtrace {
… …
3440 $msg =~ s/\n//; 3926 $msg =~ s/\n//;
3441 3927
3442 # limit the # of concurrent backtraces 3928 # limit the # of concurrent backtraces
3443 if ($_log_backtrace < 2) { 3929 if ($_log_backtrace < 2) {
3444 ++$_log_backtrace; 3930 ++$_log_backtrace;
3931 my $perl_bt = Carp::longmess $msg;
3445 async { 3932 async {
3933 $Coro::current->{desc} = "abt $msg";
3934
3446 my @bt = fork_call { 3935 my @bt = fork_call {
3447 @addr = map { sprintf "%x", $_ } @addr; 3936 @addr = map { sprintf "%x", $_ } @addr;
3448 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3937 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3449 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3938 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3450 or die "addr2line: $!"; 3939 or die "addr2line: $!";
… …
3458 } 3947 }
3459 3948
3460 @funcs 3949 @funcs
3461 }; 3950 };
3462 3951
3463 LOG llevInfo, "[ABT] $msg\n"; 3952 LOG llevInfo, "[ABT] $perl_bt\n";
3953 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3464 LOG llevInfo, "[ABT] $_\n" for @bt; 3954 LOG llevInfo, "[ABT] $_\n" for @bt;
3465 --$_log_backtrace; 3955 --$_log_backtrace;
3466 }; 3956 };
3467 } else { 3957 } else {
3468 LOG llevInfo, "[ABT] $msg\n"; 3958 LOG llevInfo, "[ABT] $msg\n";
3469 LOG llevInfo, "[ABT] [suppressed]\n"; 3959 LOG llevInfo, "[ABT] [suppressed]\n";
3470 } 3960 }
3471} 3961}
3472 3962
3473# load additional modules 3963# load additional modules
3474use cf::pod; 3964require "cf/$_.pm" for @EXTRA_MODULES;
3475 3965
3476END { cf::emergency_save } 3966END { cf::emergency_save }
3477 3967
34781 39681
3479 3969

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines