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

Diff Legend

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