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.308 by root, Mon Jul 16 14:09:40 2007 UTC vs.
Revision 1.480 by root, Thu Oct 8 05:09:43 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;
93our @REFLECT; # set by XS
94our %REFLECT; # set by us
62 95
63our $CONFDIR = confdir; 96our $CONFDIR = confdir;
64our $DATADIR = datadir; 97our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 98our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 99our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 100our $MAPDIR = "$DATADIR/" . mapdir;
68our $LOCALDIR = localdir; 101our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 102our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 103our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 104our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 105our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 106our $BDBDIR = "$LOCALDIR/db";
107our $PIDFILE = "$LOCALDIR/pid";
108our $RUNTIMEFILE = "$LOCALDIR/runtime";
109
110our %RESOURCE;
74 111
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 112our $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 113our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 114our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 115our $USE_FSYNC = 1; # use fsync to write maps - default on
82 116
117our $BDB_DEADLOCK_WATCHER;
118our $BDB_CHECKPOINT_WATCHER;
83our $BDB_POLL_WATCHER; 119our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 120our $DB_ENV;
121
122our @EXTRA_MODULES = qw(pod mapscript);
85 123
86our %CFG; 124our %CFG;
87 125
88our $UPTIME; $UPTIME ||= time; 126our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 127our $RUNTIME;
128our $NOW;
90 129
91our %PLAYER; # all users 130our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 131our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 132our $LINK_MAP; # the special {link} map, which is always available
94 133
95# used to convert map paths into valid unix filenames by replacing / by ∕ 134# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 135our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 136
98our $LOAD; # a number between 0 (idle) and 1 (too many objects) 137our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing 138our $LOADAVG; # same thing, but with alpha-smoothing
139our $JITTER; # average jitter
100our $tick_start; # for load detecting purposes 140our $TICK_START; # for load detecting purposes
141
142our @POST_INIT;
143
144our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
145our $REALLY_UNLOOP; # never set to true, please :)
101 146
102binmode STDOUT; 147binmode STDOUT;
103binmode STDERR; 148binmode STDERR;
104 149
105# read virtual server time, if available 150# read virtual server time, if available
106unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 151unless ($RUNTIME || !-e $RUNTIMEFILE) {
107 open my $fh, "<", "$LOCALDIR/runtime" 152 open my $fh, "<", $RUNTIMEFILE
108 or die "unable to read runtime file: $!"; 153 or die "unable to read $RUNTIMEFILE file: $!";
109 $RUNTIME = <$fh> + 0.; 154 $RUNTIME = <$fh> + 0.;
110} 155}
156
157eval "sub TICK() { $TICK } 1" or die;
111 158
112mkdir $_ 159mkdir $_
113 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 160 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
114 161
115our $EMERGENCY_POSITION; 162our $EMERGENCY_POSITION;
116 163
117sub cf::map::normalise; 164sub cf::map::normalise;
165
166#############################################################################
167
168%REFLECT = ();
169for (@REFLECT) {
170 my $reflect = JSON::XS::decode_json $_;
171 $REFLECT{$reflect->{class}} = $reflect;
172}
173
174# this is decidedly evil
175$REFLECT{object}{flags} = [grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"}];
118 176
119############################################################################# 177#############################################################################
120 178
121=head2 GLOBAL VARIABLES 179=head2 GLOBAL VARIABLES
122 180
… …
158 216
159The raw value load value from the last tick. 217The raw value load value from the last tick.
160 218
161=item %cf::CFG 219=item %cf::CFG
162 220
163Configuration for the server, loaded from C</etc/crossfire/config>, or 221Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 222from wherever your confdir points to.
165 223
166=item cf::wait_for_tick, cf::wait_for_tick_begin 224=item cf::wait_for_tick, cf::wait_for_tick_begin
167 225
168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 226These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
169returns directly I<after> the tick processing (and consequently, can only wake one process 227returns directly I<after> the tick processing (and consequently, can only wake one process
170per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 228per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
171 229
230=item @cf::INVOKE_RESULTS
231
232This array contains the results of the last C<invoke ()> call. When
233C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
234that call.
235
236=item %cf::REFLECT
237
238Contains, for each (C++) class name, a hash reference with information
239about object members (methods, scalars, arrays and flags) and other
240metadata, which is useful for introspection.
241
172=back 242=back
173 243
174=cut 244=cut
175 245
176BEGIN { 246$Coro::State::WARNHOOK = sub {
177 *CORE::GLOBAL::warn = sub {
178 my $msg = join "", @_; 247 my $msg = join "", @_;
179 248
180 $msg .= "\n" 249 $msg .= "\n"
181 unless $msg =~ /\n$/; 250 unless $msg =~ /\n$/;
182 251
183 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 252 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
184 253
185 utf8::encode $msg;
186 LOG llevError, $msg; 254 LOG llevError, $msg;
187 }; 255};
188} 256
257$Coro::State::DIEHOOK = sub {
258 return unless $^S eq 0; # "eq", not "=="
259
260 warn Carp::longmess $_[0];
261
262 if ($Coro::current == $Coro::main) {#d#
263 warn "DIEHOOK called in main context, Coro bug?\n";#d#
264 return;#d#
265 }#d#
266
267 # kill coroutine otherwise
268 Coro::terminate
269};
189 270
190@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 271@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
191@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 272@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
192@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 273@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
193@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 274@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
200for my $pkg (qw( 281for my $pkg (qw(
201 cf::global cf::attachable 282 cf::global cf::attachable
202 cf::object cf::object::player 283 cf::object cf::object::player
203 cf::client cf::player 284 cf::client cf::player
204 cf::arch cf::living 285 cf::arch cf::living
286 cf::map cf::mapspace
205 cf::map cf::party cf::region 287 cf::party cf::region
206)) { 288)) {
207 no strict 'refs';
208 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 289 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
209} 290}
210 291
211$Event::DIED = sub { 292$EV::DIED = sub {
212 warn "error in event callback: @_"; 293 warn "error in event callback: @_";
213}; 294};
214 295
215############################################################################# 296#############################################################################
216 297
… …
239 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 320 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
240 $d 321 $d
241 } || "[unable to dump $_[0]: '$@']"; 322 } || "[unable to dump $_[0]: '$@']";
242} 323}
243 324
244=item $ref = cf::from_json $json 325=item $ref = cf::decode_json $json
245 326
246Converts a JSON string into the corresponding perl data structure. 327Converts a JSON string into the corresponding perl data structure.
247 328
248=item $json = cf::to_json $ref 329=item $json = cf::encode_json $ref
249 330
250Converts a perl data structure into its JSON representation. 331Converts a perl data structure into its JSON representation.
251 332
252=cut 333=cut
253 334
254our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 335our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
255 336
256sub to_json ($) { $json_coder->encode ($_[0]) } 337sub encode_json($) { $json_coder->encode ($_[0]) }
257sub from_json ($) { $json_coder->decode ($_[0]) } 338sub decode_json($) { $json_coder->decode ($_[0]) }
339
340=item cf::post_init { BLOCK }
341
342Execute the given codeblock, I<after> all extensions have been (re-)loaded,
343but I<before> the server starts ticking again.
344
345The cdoeblock will have a single boolean argument to indicate whether this
346is a reload or not.
347
348=cut
349
350sub post_init(&) {
351 push @POST_INIT, shift;
352}
258 353
259=item cf::lock_wait $string 354=item cf::lock_wait $string
260 355
261Wait until the given lock is available. See cf::lock_acquire. 356Wait until the given lock is available. See cf::lock_acquire.
262 357
263=item my $lock = cf::lock_acquire $string 358=item my $lock = cf::lock_acquire $string
264 359
265Wait until the given lock is available and then acquires it and returns 360Wait until the given lock is available and then acquires it and returns
266a Coro::guard object. If the guard object gets destroyed (goes out of scope, 361a L<Guard> object. If the guard object gets destroyed (goes out of scope,
267for example when the coroutine gets canceled), the lock is automatically 362for example when the coroutine gets canceled), the lock is automatically
268returned. 363returned.
269 364
365Locks are *not* recursive, locking from the same coro twice results in a
366deadlocked coro.
367
270Lock names should begin with a unique identifier (for example, cf::map::find 368Lock names should begin with a unique identifier (for example, cf::map::find
271uses map_find and cf::map::load uses map_load). 369uses map_find and cf::map::load uses map_load).
272 370
273=item $locked = cf::lock_active $string 371=item $locked = cf::lock_active $string
274 372
275Return true if the lock is currently active, i.e. somebody has locked it. 373Return true if the lock is currently active, i.e. somebody has locked it.
276 374
277=cut 375=cut
278 376
279our %LOCK; 377our $LOCKS = new Coro::SemaphoreSet;
280 378
281sub lock_wait($) { 379sub lock_wait($) {
282 my ($key) = @_; 380 $LOCKS->wait ($_[0]);
283
284 # wait for lock, if any
285 while ($LOCK{$key}) {
286 push @{ $LOCK{$key} }, $Coro::current;
287 Coro::schedule;
288 }
289} 381}
290 382
291sub lock_acquire($) { 383sub lock_acquire($) {
292 my ($key) = @_; 384 $LOCKS->guard ($_[0])
293
294 # wait, to be sure we are not locked
295 lock_wait $key;
296
297 $LOCK{$key} = [];
298
299 Coro::guard {
300 # wake up all waiters, to be on the safe side
301 $_->ready for @{ delete $LOCK{$key} };
302 }
303} 385}
304 386
305sub lock_active($) { 387sub lock_active($) {
306 my ($key) = @_; 388 $LOCKS->count ($_[0]) < 1
307
308 ! ! $LOCK{$key}
309} 389}
310 390
311sub freeze_mainloop { 391sub freeze_mainloop {
312 return unless $TICK_WATCHER->is_active; 392 tick_inhibit_inc;
313 393
314 my $guard = Coro::guard { 394 &Guard::guard (\&tick_inhibit_dec);
315 $TICK_WATCHER->start; 395}
396
397=item cf::periodic $interval, $cb
398
399Like EV::periodic, but randomly selects a starting point so that the actions
400get spread over timer.
401
402=cut
403
404sub periodic($$) {
405 my ($interval, $cb) = @_;
406
407 my $start = rand List::Util::min 180, $interval;
408
409 EV::periodic $start, $interval, 0, $cb
410}
411
412=item cf::get_slot $time[, $priority[, $name]]
413
414Allocate $time seconds of blocking CPU time at priority C<$priority>:
415This call blocks and returns only when you have at least C<$time> seconds
416of cpu time till the next tick. The slot is only valid till the next cede.
417
418The optional C<$name> can be used to identify the job to run. It might be
419used for statistical purposes and should identify the same time-class.
420
421Useful for short background jobs.
422
423=cut
424
425our @SLOT_QUEUE;
426our $SLOT_QUEUE;
427
428$SLOT_QUEUE->cancel if $SLOT_QUEUE;
429$SLOT_QUEUE = Coro::async {
430 $Coro::current->desc ("timeslot manager");
431
432 my $signal = new Coro::Signal;
433
434 while () {
435 next_job:
436 my $avail = cf::till_tick;
437 if ($avail > 0.01) {
438 for (0 .. $#SLOT_QUEUE) {
439 if ($SLOT_QUEUE[$_][0] < $avail) {
440 my $job = splice @SLOT_QUEUE, $_, 1, ();
441 $job->[2]->send;
442 Coro::cede;
443 goto next_job;
444 }
445 }
446 }
447
448 if (@SLOT_QUEUE) {
449 # we do not use wait_for_tick() as it returns immediately when tick is inactive
450 push @cf::WAIT_FOR_TICK, $signal;
451 $signal->wait;
452 } else {
453 Coro::schedule;
454 }
316 }; 455 }
317 $TICK_WATCHER->stop; 456};
318 $guard 457
458sub get_slot($;$$) {
459 return if tick_inhibit || $Coro::current == $Coro::main;
460
461 my ($time, $pri, $name) = @_;
462
463 $time = $TICK * .6 if $time > $TICK * .6;
464 my $sig = new Coro::Signal;
465
466 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
467 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
468 $SLOT_QUEUE->ready;
469 $sig->wait;
319} 470}
320 471
321=item cf::async { BLOCK } 472=item cf::async { BLOCK }
322 473
323Currently the same as Coro::async_pool, meaning you cannot use 474Currently the same as Coro::async_pool, meaning you cannot use
… …
328 479
329BEGIN { *async = \&Coro::async_pool } 480BEGIN { *async = \&Coro::async_pool }
330 481
331=item cf::sync_job { BLOCK } 482=item cf::sync_job { BLOCK }
332 483
333The design of Crossfire TRT requires that the main coroutine ($Coro::main) 484The design of Deliantra requires that the main coroutine ($Coro::main)
334is always able to handle events or runnable, as Crossfire TRT is only 485is always able to handle events or runnable, as Deliantra is only
335partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 486partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
336acceptable. 487acceptable.
337 488
338If it must be done, put the blocking parts into C<sync_job>. This will run 489If it must be done, put the blocking parts into C<sync_job>. This will run
339the given BLOCK in another coroutine while waiting for the result. The 490the given BLOCK in another coroutine while waiting for the result. The
… …
344 495
345sub sync_job(&) { 496sub sync_job(&) {
346 my ($job) = @_; 497 my ($job) = @_;
347 498
348 if ($Coro::current == $Coro::main) { 499 if ($Coro::current == $Coro::main) {
349 my $time = Event::time; 500 my $time = EV::time;
350 501
351 # this is the main coro, too bad, we have to block 502 # this is the main coro, too bad, we have to block
352 # till the operation succeeds, freezing the server :/ 503 # till the operation succeeds, freezing the server :/
353 504
354 # TODO: use suspend/resume instead 505 LOG llevError, Carp::longmess "sync job";#d#
355 # (but this is cancel-safe) 506
356 my $freeze_guard = freeze_mainloop; 507 my $freeze_guard = freeze_mainloop;
357 508
358 my $busy = 1; 509 my $busy = 1;
359 my @res; 510 my @res;
360 511
361 (async { 512 (async {
513 $Coro::current->desc ("sync job coro");
362 @res = eval { $job->() }; 514 @res = eval { $job->() };
363 warn $@ if $@; 515 warn $@ if $@;
364 undef $busy; 516 undef $busy;
365 })->prio (Coro::PRIO_MAX); 517 })->prio (Coro::PRIO_MAX);
366 518
367 while ($busy) { 519 while ($busy) {
368 Coro::cede or Event::one_event; 520 if (Coro::nready) {
521 Coro::cede_notself;
522 } else {
523 EV::loop EV::LOOP_ONESHOT;
369 } 524 }
525 }
370 526
371 $time = Event::time - $time; 527 my $time = EV::time - $time;
372 528
373 LOG llevError | logBacktrace, Carp::longmess "long sync job"
374 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
375
376 $tick_start += $time; # do not account sync jobs to server load 529 $TICK_START += $time; # do not account sync jobs to server load
377 530
378 wantarray ? @res : $res[0] 531 wantarray ? @res : $res[0]
379 } else { 532 } else {
380 # we are in another coroutine, how wonderful, everything just works 533 # we are in another coroutine, how wonderful, everything just works
381 534
… …
406=item fork_call { }, $args 559=item fork_call { }, $args
407 560
408Executes the given code block with the given arguments in a seperate 561Executes the given code block with the given arguments in a seperate
409process, returning the results. Everything must be serialisable with 562process, returning the results. Everything must be serialisable with
410Coro::Storable. May, of course, block. Note that the executed sub may 563Coro::Storable. May, of course, block. Note that the executed sub may
411never block itself or use any form of Event handling. 564never block itself or use any form of event handling.
412 565
413=cut 566=cut
414
415sub _store_scalar {
416 open my $fh, ">", \my $buf
417 or die "fork_call: cannot open fh-to-buf in child : $!";
418 Storable::store_fd $_[0], $fh;
419 close $fh;
420
421 $buf
422}
423 567
424sub fork_call(&@) { 568sub fork_call(&@) {
425 my ($cb, @args) = @_; 569 my ($cb, @args) = @_;
426 570
427# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 571 # we seemingly have to make a local copy of the whole thing,
428# or die "socketpair: $!"; 572 # otherwise perl prematurely frees the stuff :/
429 pipe my $fh1, my $fh2 573 # TODO: investigate and fix (likely this will be rather laborious)
430 or die "pipe: $!";
431 574
432 if (my $pid = fork) { 575 my @res = Coro::Util::fork_eval {
433 close $fh2;
434
435 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
436 warn "pst<$res>" unless $res =~ /^pst/;
437 $res = Coro::Storable::thaw $res;
438
439 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
440
441 Carp::confess $$res unless "ARRAY" eq ref $res;
442
443 return wantarray ? @$res : $res->[-1];
444 } else {
445 reset_signals; 576 reset_signals;
446 local $SIG{__WARN__}; 577 &$cb
447 local $SIG{__DIE__}; 578 }, @args;
448 # just in case, this hack effectively disables event
449 # in the child. cleaner and slower would be canceling all watchers,
450 # but this works for the time being.
451 local $Coro::idle;
452 $Coro::current->prio (Coro::PRIO_MAX);
453 579
454 eval { 580 wantarray ? @res : $res[-1]
455 close $fh1; 581}
456 582
457 my @res = eval { $cb->(@args) }; 583=item $coin = coin_from_name $name
458 584
459 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 585=cut
460 close $fh2;
461 };
462 586
463 warn $@ if $@; 587our %coin_alias = (
464 _exit 0; 588 "silver" => "silvercoin",
465 } 589 "silvercoin" => "silvercoin",
590 "silvercoins" => "silvercoin",
591 "gold" => "goldcoin",
592 "goldcoin" => "goldcoin",
593 "goldcoins" => "goldcoin",
594 "platinum" => "platinacoin",
595 "platinumcoin" => "platinacoin",
596 "platinumcoins" => "platinacoin",
597 "platina" => "platinacoin",
598 "platinacoin" => "platinacoin",
599 "platinacoins" => "platinacoin",
600 "royalty" => "royalty",
601 "royalties" => "royalty",
602);
603
604sub coin_from_name($) {
605 $coin_alias{$_[0]}
606 ? cf::arch::find $coin_alias{$_[0]}
607 : undef
466} 608}
467 609
468=item $value = cf::db_get $family => $key 610=item $value = cf::db_get $family => $key
469 611
470Returns a single value from the environment database. 612Returns a single value from the environment database.
… …
472=item cf::db_put $family => $key => $value 614=item cf::db_put $family => $key => $value
473 615
474Stores the given C<$value> in the family. It can currently store binary 616Stores the given C<$value> in the family. It can currently store binary
475data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 617data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
476 618
619=item $db = cf::db_table "name"
620
621Create and/or open a new database table. The string must not be "db" and must be unique
622within each server.
623
477=cut 624=cut
625
626sub db_table($) {
627 my ($name) = @_;
628 my $db = BDB::db_create $DB_ENV;
629
630 eval {
631 $db->set_flags (BDB::CHKSUM);
632
633 utf8::encode $name;
634 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
635 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
636 cf::cleanup "db_open(db): $!" if $!;
637 };
638 cf::cleanup "db_open(db): $@" if $@;
639
640 $db
641}
478 642
479our $DB; 643our $DB;
480 644
481sub db_init { 645sub db_init {
482 unless ($DB) {
483 $DB = BDB::db_create $DB_ENV;
484
485 cf::sync_job { 646 cf::sync_job {
486 eval { 647 $DB ||= db_table "db";
487 $DB->set_flags (BDB::CHKSUM);
488
489 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
490 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
491 cf::cleanup "db_open(db): $!" if $!;
492 };
493 cf::cleanup "db_open(db): $@" if $@;
494 };
495 } 648 };
496} 649}
497 650
498sub db_get($$) { 651sub db_get($$) {
499 my $key = "$_[0]/$_[1]"; 652 my $key = "$_[0]/$_[1]";
500 653
… …
550 if (1) { 703 if (1) {
551 $md5 = 704 $md5 =
552 join "\x00", 705 join "\x00",
553 $processversion, 706 $processversion,
554 map { 707 map {
555 Coro::cede; 708 cf::cede_to_tick;
556 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 709 ($src->[$_], Digest::MD5::md5_hex $data[$_])
557 } 0.. $#$src; 710 } 0.. $#$src;
558 711
559 712
560 my $dbmd5 = db_get cache => "$id/md5"; 713 my $dbmd5 = db_get cache => "$id/md5";
… …
598 751
599############################################################################# 752#############################################################################
600 753
601=head2 ATTACHABLE OBJECTS 754=head2 ATTACHABLE OBJECTS
602 755
603Many objects in crossfire are so-called attachable objects. That means you can 756Many objects in deliantra are so-called attachable objects. That means you can
604attach callbacks/event handlers (a collection of which is called an "attachment") 757attach callbacks/event handlers (a collection of which is called an "attachment")
605to it. All such attachable objects support the following methods. 758to it. All such attachable objects support the following methods.
606 759
607In the following description, CLASS can be any of C<global>, C<object> 760In the following description, CLASS can be any of C<global>, C<object>
608C<player>, C<client> or C<map> (i.e. the attachable objects in 761C<player>, C<client> or C<map> (i.e. the attachable objects in
609Crossfire TRT). 762Deliantra).
610 763
611=over 4 764=over 4
612 765
613=item $attachable->attach ($attachment, key => $value...) 766=item $attachable->attach ($attachment, key => $value...)
614 767
… …
658=item cf::CLASS::attachment $name, ... 811=item cf::CLASS::attachment $name, ...
659 812
660Register an attachment by C<$name> through which attachable objects of the 813Register an attachment by C<$name> through which attachable objects of the
661given CLASS can refer to this attachment. 814given CLASS can refer to this attachment.
662 815
663Some classes such as crossfire maps and objects can specify attachments 816Some classes such as deliantra maps and objects can specify attachments
664that are attached at load/instantiate time, thus the need for a name. 817that are attached at load/instantiate time, thus the need for a name.
665 818
666These calls expect any number of the following handler/hook descriptions: 819These calls expect any number of the following handler/hook descriptions:
667 820
668=over 4 821=over 4
… …
866 "; 1019 ";
867 die if $@; 1020 die if $@;
868} 1021}
869 1022
870our $override; 1023our $override;
871our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 1024our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
872 1025
873sub override { 1026sub override {
874 $override = 1; 1027 $override = 1;
875 @invoke_results = (); 1028 @INVOKE_RESULTS = (@_);
876} 1029}
877 1030
878sub do_invoke { 1031sub do_invoke {
879 my $event = shift; 1032 my $event = shift;
880 my $callbacks = shift; 1033 my $callbacks = shift;
881 1034
882 @invoke_results = (); 1035 @INVOKE_RESULTS = ();
883 1036
884 local $override; 1037 local $override;
885 1038
886 for (@$callbacks) { 1039 for (@$callbacks) {
887 eval { &{$_->[1]} }; 1040 eval { &{$_->[1]} };
… …
896 } 1049 }
897 1050
898 0 1051 0
899} 1052}
900 1053
901=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1054=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
902 1055
903=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1056=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
904 1057
905Generate an object-specific event with the given arguments. 1058Generate an object-specific event with the given arguments.
906 1059
907This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1060This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
908removed in future versions), and there is no public API to access override 1061removed in future versions), and there is no public API to access override
909results (if you must, access C<@cf::invoke_results> directly). 1062results (if you must, access C<@cf::INVOKE_RESULTS> directly).
910 1063
911=back 1064=back
912 1065
913=cut 1066=cut
914 1067
915############################################################################# 1068#############################################################################
916# object support 1069# object support
1070
1071sub _object_equal($$);
1072sub _object_equal($$) {
1073 my ($a, $b) = @_;
1074
1075 return 0 unless (ref $a) eq (ref $b);
1076
1077 if ("HASH" eq ref $a) {
1078 my @ka = keys %$a;
1079 my @kb = keys %$b;
1080
1081 return 0 if @ka != @kb;
1082
1083 for (0 .. $#ka) {
1084 return 0 unless $ka[$_] eq $kb[$_];
1085 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1086 }
1087
1088 } elsif ("ARRAY" eq ref $a) {
1089
1090 return 0 if @$a != @$b;
1091
1092 for (0 .. $#$a) {
1093 return 0 unless _object_equal $a->[$_], $b->[$_];
1094 }
1095
1096 } elsif ($a ne $b) {
1097 return 0;
1098 }
1099
1100 1
1101}
1102
1103our $SLOW_MERGES;#d#
1104sub _can_merge {
1105 my ($ob1, $ob2) = @_;
1106
1107 ++$SLOW_MERGES;#d#
1108
1109 # we do the slow way here
1110 return _object_equal $ob1, $ob2
1111}
917 1112
918sub reattach { 1113sub reattach {
919 # basically do the same as instantiate, without calling instantiate 1114 # basically do the same as instantiate, without calling instantiate
920 my ($obj) = @_; 1115 my ($obj) = @_;
921 1116
1117 # no longer needed after getting rid of delete_package?
922 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1118 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
923 1119
924 my $registry = $obj->registry; 1120 my $registry = $obj->registry;
925 1121
926 @$registry = (); 1122 @$registry = ();
927 1123
… …
942cf::attachable->attach ( 1138cf::attachable->attach (
943 prio => -1000000, 1139 prio => -1000000,
944 on_instantiate => sub { 1140 on_instantiate => sub {
945 my ($obj, $data) = @_; 1141 my ($obj, $data) = @_;
946 1142
947 $data = from_json $data; 1143 $data = decode_json $data;
948 1144
949 for (@$data) { 1145 for (@$data) {
950 my ($name, $args) = @$_; 1146 my ($name, $args) = @$_;
951 1147
952 $obj->attach ($name, %{$args || {} }); 1148 $obj->attach ($name, %{$args || {} });
… …
968sub object_freezer_save { 1164sub object_freezer_save {
969 my ($filename, $rdata, $objs) = @_; 1165 my ($filename, $rdata, $objs) = @_;
970 1166
971 sync_job { 1167 sync_job {
972 if (length $$rdata) { 1168 if (length $$rdata) {
1169 utf8::decode (my $decname = $filename);
973 warn sprintf "saving %s (%d,%d)\n", 1170 warn sprintf "saving %s (%d,%d)\n",
974 $filename, length $$rdata, scalar @$objs; 1171 $decname, length $$rdata, scalar @$objs;
975 1172
976 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1173 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
977 chmod SAVE_MODE, $fh; 1174 aio_chmod $fh, SAVE_MODE;
978 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1175 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
979 aio_fsync $fh if $cf::USE_FSYNC; 1176 if ($cf::USE_FSYNC) {
1177 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;
1178 aio_fsync $fh;
1179 }
980 close $fh; 1180 aio_close $fh;
981 1181
982 if (@$objs) { 1182 if (@$objs) {
983 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1183 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
984 chmod SAVE_MODE, $fh; 1184 aio_chmod $fh, SAVE_MODE;
985 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1185 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
986 aio_write $fh, 0, (length $data), $data, 0; 1186 aio_write $fh, 0, (length $data), $data, 0;
987 aio_fsync $fh if $cf::USE_FSYNC; 1187 if ($cf::USE_FSYNC) {
1188 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;
1189 aio_fsync $fh;
1190 }
988 close $fh; 1191 aio_close $fh;
989 aio_rename "$filename.pst~", "$filename.pst"; 1192 aio_rename "$filename.pst~", "$filename.pst";
990 } 1193 }
991 } else { 1194 } else {
992 aio_unlink "$filename.pst"; 1195 aio_unlink "$filename.pst";
993 } 1196 }
994 1197
995 aio_rename "$filename~", $filename; 1198 aio_rename "$filename~", $filename;
1199
1200 $filename =~ s%/[^/]+$%%;
1201 aio_pathsync $filename if $cf::USE_FSYNC;
996 } else { 1202 } else {
997 warn "FATAL: $filename~: $!\n"; 1203 warn "unable to save objects: $filename~: $!\n";
998 } 1204 }
999 } else { 1205 } else {
1000 aio_unlink $filename; 1206 aio_unlink $filename;
1001 aio_unlink "$filename.pst"; 1207 aio_unlink "$filename.pst";
1002 } 1208 }
1003 } 1209 };
1004} 1210}
1005 1211
1006sub object_freezer_as_string { 1212sub object_freezer_as_string {
1007 my ($rdata, $objs) = @_; 1213 my ($rdata, $objs) = @_;
1008 1214
… …
1020 or return; 1226 or return;
1021 1227
1022 unless (aio_stat "$filename.pst") { 1228 unless (aio_stat "$filename.pst") {
1023 (aio_load "$filename.pst", $av) >= 0 1229 (aio_load "$filename.pst", $av) >= 0
1024 or return; 1230 or return;
1231
1025 $av = eval { (Storable::thaw $av)->{objs} }; 1232 my $st = eval { Coro::Storable::thaw $av };
1233 $av = $st->{objs};
1026 } 1234 }
1027 1235
1236 utf8::decode (my $decname = $filename);
1028 warn sprintf "loading %s (%d)\n", 1237 warn sprintf "loading %s (%d,%d)\n",
1029 $filename, length $data, scalar @{$av || []}; 1238 $decname, length $data, scalar @{$av || []};
1239
1030 return ($data, $av); 1240 ($data, $av)
1031} 1241}
1032 1242
1033=head2 COMMAND CALLBACKS 1243=head2 COMMAND CALLBACKS
1034 1244
1035=over 4 1245=over 4
… …
1089 my ($name, $cb) = @_; 1299 my ($name, $cb) = @_;
1090 1300
1091 $EXTICMD{$name} = $cb; 1301 $EXTICMD{$name} = $cb;
1092} 1302}
1093 1303
1304use File::Glob ();
1305
1094cf::player->attach ( 1306cf::player->attach (
1095 on_command => sub { 1307 on_command => sub {
1096 my ($pl, $name, $params) = @_; 1308 my ($pl, $name, $params) = @_;
1097 1309
1098 my $cb = $COMMAND{$name} 1310 my $cb = $COMMAND{$name}
… …
1108 my ($pl, $buf) = @_; 1320 my ($pl, $buf) = @_;
1109 1321
1110 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1322 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1111 1323
1112 if (ref $msg) { 1324 if (ref $msg) {
1325 my ($type, $reply, @payload) =
1326 "ARRAY" eq ref $msg
1327 ? @$msg
1328 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1329
1330 my @reply;
1331
1113 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1332 if (my $cb = $EXTCMD{$type}) {
1114 if (my %reply = $cb->($pl, $msg)) { 1333 @reply = $cb->($pl, @payload);
1115 $pl->ext_reply ($msg->{msgid}, %reply);
1116 }
1117 } 1334 }
1335
1336 $pl->ext_reply ($reply, @reply)
1337 if $reply;
1338
1118 } else { 1339 } else {
1119 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1340 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1120 } 1341 }
1121 1342
1122 cf::override; 1343 cf::override;
1123 }, 1344 },
1124); 1345);
1346
1347# "readahead" all extensions
1348sub cache_extensions {
1349 my $grp = IO::AIO::aio_group;
1350
1351 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1352 for (grep /\.ext$/, @{$_[0]}) {
1353 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1354 }
1355 };
1356
1357 $grp
1358}
1125 1359
1126sub load_extensions { 1360sub load_extensions {
1127 cf::sync_job { 1361 cf::sync_job {
1128 my %todo; 1362 my %todo;
1129 1363
… …
1149 1383
1150 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1384 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1151 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1385 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1152 1386
1153 $ext{source} = 1387 $ext{source} =
1154 "package $pkg; use strict; use utf8;\n" 1388 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1155 . "#line 1 \"$path\"\n{\n" 1389 . "#line 1 \"$path\"\n{\n"
1156 . $source 1390 . $source
1157 . "\n};\n1"; 1391 . "\n};\n1";
1158 1392
1159 $todo{$base} = \%ext; 1393 $todo{$base} = \%ext;
… …
1175 my $msg = $@ ? "$v->{path}: $@\n" 1409 my $msg = $@ ? "$v->{path}: $@\n"
1176 : "$v->{base}: extension inactive.\n"; 1410 : "$v->{base}: extension inactive.\n";
1177 1411
1178 if (exists $v->{meta}{mandatory}) { 1412 if (exists $v->{meta}{mandatory}) {
1179 warn $msg; 1413 warn $msg;
1180 warn "mandatory extension failed to load, exiting.\n"; 1414 cf::cleanup "mandatory extension failed to load, exiting.";
1181 exit 1;
1182 } 1415 }
1183 1416
1184 warn $msg; 1417 warn $msg;
1185 } 1418 }
1186 1419
… …
1200 1433
1201=back 1434=back
1202 1435
1203=head2 CORE EXTENSIONS 1436=head2 CORE EXTENSIONS
1204 1437
1205Functions and methods that extend core crossfire objects. 1438Functions and methods that extend core deliantra objects.
1206 1439
1207=cut 1440=cut
1208 1441
1209package cf::player; 1442package cf::player;
1210 1443
1211use Coro::AIO; 1444use Coro::AIO;
1212 1445
1213=head3 cf::player 1446=head3 cf::player
1214 1447
1215=over 4 1448=over 4
1449
1450=item cf::player::num_playing
1451
1452Returns the official number of playing players, as per the Crossfire metaserver rules.
1453
1454=cut
1455
1456sub num_playing {
1457 scalar grep
1458 $_->ob->map
1459 && !$_->hidden
1460 && !$_->ob->flag (cf::FLAG_WIZ),
1461 cf::player::list
1462}
1216 1463
1217=item cf::player::find $login 1464=item cf::player::find $login
1218 1465
1219Returns the given player object, loading it if necessary (might block). 1466Returns the given player object, loading it if necessary (might block).
1220 1467
… …
1239 1486
1240sub exists($) { 1487sub exists($) {
1241 my ($login) = @_; 1488 my ($login) = @_;
1242 1489
1243 $cf::PLAYER{$login} 1490 $cf::PLAYER{$login}
1244 or cf::sync_job { !aio_stat path $login } 1491 or !aio_stat path $login
1245} 1492}
1246 1493
1247sub find($) { 1494sub find($) {
1248 return $cf::PLAYER{$_[0]} || do { 1495 return $cf::PLAYER{$_[0]} || do {
1249 my $login = $_[0]; 1496 my $login = $_[0];
… …
1256 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1503 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1257 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1504 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1258 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1505 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1259 aio_unlink +(playerdir $login) . "/$login.pl"; 1506 aio_unlink +(playerdir $login) . "/$login.pl";
1260 1507
1261 my $pl = load_pl path $login 1508 my $f = new_from_file cf::object::thawer path $login
1262 or return; 1509 or return;
1510
1511 my $pl = cf::player::load_pl $f
1512 or return;
1513
1514 local $cf::PLAYER_LOADING{$login} = $pl;
1515 $f->resolve_delayed_derefs;
1263 $cf::PLAYER{$login} = $pl 1516 $cf::PLAYER{$login} = $pl
1264 } 1517 }
1265 } 1518 }
1266} 1519}
1267 1520
… …
1276 return if $pl->{deny_save}; 1529 return if $pl->{deny_save};
1277 1530
1278 aio_mkdir playerdir $pl, 0770; 1531 aio_mkdir playerdir $pl, 0770;
1279 $pl->{last_save} = $cf::RUNTIME; 1532 $pl->{last_save} = $cf::RUNTIME;
1280 1533
1534 cf::get_slot 0.01;
1535
1281 $pl->save_pl ($path); 1536 $pl->save_pl ($path);
1282 Coro::cede; 1537 cf::cede_to_tick;
1283} 1538}
1284 1539
1285sub new($) { 1540sub new($) {
1286 my ($login) = @_; 1541 my ($login) = @_;
1287 1542
… …
1293 $cf::PLAYER{$login} = $self; 1548 $cf::PLAYER{$login} = $self;
1294 1549
1295 $self 1550 $self
1296} 1551}
1297 1552
1553=item $player->send_msg ($channel, $msg, $color, [extra...])
1554
1555=cut
1556
1557sub send_msg {
1558 my $ns = shift->ns
1559 or return;
1560 $ns->send_msg (@_);
1561}
1562
1298=item $pl->quit_character 1563=item $pl->quit_character
1299 1564
1300Nukes the player without looking back. If logged in, the connection will 1565Nukes the player without looking back. If logged in, the connection will
1301be destroyed. May block for a long time. 1566be destroyed. May block for a long time.
1302 1567
… …
1306 my ($pl) = @_; 1571 my ($pl) = @_;
1307 1572
1308 my $name = $pl->ob->name; 1573 my $name = $pl->ob->name;
1309 1574
1310 $pl->{deny_save} = 1; 1575 $pl->{deny_save} = 1;
1311 $pl->password ("*"); # this should lock out the player until we nuked the dir 1576 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1312 1577
1313 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1578 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1314 $pl->deactivate; 1579 $pl->deactivate;
1580 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1581 $pl->ob->check_score;
1315 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1582 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1316 $pl->ns->destroy if $pl->ns; 1583 $pl->ns->destroy if $pl->ns;
1317 1584
1318 my $path = playerdir $pl; 1585 my $path = playerdir $pl;
1319 my $temp = "$path~$cf::RUNTIME~deleting~"; 1586 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1355 or return []; 1622 or return [];
1356 1623
1357 my @logins; 1624 my @logins;
1358 1625
1359 for my $login (@$dirs) { 1626 for my $login (@$dirs) {
1627 my $path = path $login;
1628
1629 # a .pst is a dead give-away for a valid player
1630 # if no pst file found, open and chekc for blocked users
1631 if (aio_stat "$path.pst") {
1360 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1632 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1361 aio_read $fh, 0, 512, my $buf, 0 or next; 1633 aio_read $fh, 0, 512, my $buf, 0 or next;
1362 $buf !~ /^password -------------$/m or next; # official not-valid tag 1634 $buf !~ /^password -------------$/m or next; # official not-valid tag
1635 }
1363 1636
1364 utf8::decode $login; 1637 utf8::decode $login;
1365 push @logins, $login; 1638 push @logins, $login;
1366 } 1639 }
1367 1640
… …
1394 } 1667 }
1395 1668
1396 \@paths 1669 \@paths
1397} 1670}
1398 1671
1399=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1672=item $protocol_xml = $player->expand_cfpod ($cfpod)
1400 1673
1401Expand crossfire pod fragments into protocol xml. 1674Expand deliantra pod fragments into protocol xml.
1402 1675
1403=cut
1404
1405sub expand_cfpod {
1406 ((my $self), (local $_)) = @_;
1407
1408 # escape & and <
1409 s/&/&amp;/g;
1410 s/(?<![BIUGH])</&lt;/g;
1411
1412 # this is buggy, it needs to properly take care of nested <'s
1413
1414 1 while
1415 # replace B<>, I<>, U<> etc.
1416 s/B<([^\>]*)>/<b>$1<\/b>/
1417 || s/I<([^\>]*)>/<i>$1<\/i>/
1418 || s/U<([^\>]*)>/<u>$1<\/u>/
1419 # replace G<male|female> tags
1420 || s{G<([^>|]*)\|([^>]*)>}{
1421 $self->gender ? $2 : $1
1422 }ge
1423 # replace H<hint text>
1424 || s{H<([^\>]*)>}
1425 {
1426 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1427 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1428 "")
1429 [$self->{hintmode}]
1430 }ge;
1431
1432 # create single paragraphs (very hackish)
1433 s/(?<=\S)\n(?=\w)/ /g;
1434
1435 # compress some whitespace
1436 s/\s+\n/\n/g; # ws line-ends
1437 s/\n\n+/\n/g; # double lines
1438 s/^\n+//; # beginning lines
1439 s/\n+$//; # ending lines
1440
1441 $_
1442}
1443
1444sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode}
1447}
1448
1449=item $player->ext_reply ($msgid, %msg) 1676=item $player->ext_reply ($msgid, @msg)
1450 1677
1451Sends an ext reply to the player. 1678Sends an ext reply to the player.
1452 1679
1453=cut 1680=cut
1454 1681
1455sub ext_reply($$%) { 1682sub ext_reply($$@) {
1456 my ($self, $id, %msg) = @_; 1683 my ($self, $id, @msg) = @_;
1457 1684
1458 $msg{msgid} = $id; 1685 $self->ns->ext_reply ($id, @msg)
1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1460} 1686}
1461 1687
1462=item $player->ext_event ($type, %msg) 1688=item $player->ext_msg ($type, @msg)
1463 1689
1464Sends an ext event to the client. 1690Sends an ext event to the client.
1465 1691
1466=cut 1692=cut
1467 1693
1468sub ext_event($$%) { 1694sub ext_msg($$@) {
1469 my ($self, $type, %msg) = @_; 1695 my ($self, $type, @msg) = @_;
1470 1696
1471 $self->ns->ext_event ($type, %msg); 1697 $self->ns->ext_msg ($type, @msg);
1472} 1698}
1473 1699
1474=head3 cf::region 1700=head3 cf::region
1475 1701
1476=over 4 1702=over 4
… …
1520our $MAX_RESET = 3600; 1746our $MAX_RESET = 3600;
1521our $DEFAULT_RESET = 3000; 1747our $DEFAULT_RESET = 3000;
1522 1748
1523sub generate_random_map { 1749sub generate_random_map {
1524 my ($self, $rmp) = @_; 1750 my ($self, $rmp) = @_;
1751
1752 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1753
1525 # mit "rum" bekleckern, nicht 1754 # mit "rum" bekleckern, nicht
1526 $self->_create_random_map ( 1755 $self->_create_random_map (
1527 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1756 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1528 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1757 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1529 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1758 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1651 1880
1652# the temporary/swap location 1881# the temporary/swap location
1653sub save_path { 1882sub save_path {
1654 my ($self) = @_; 1883 my ($self) = @_;
1655 1884
1656 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1885 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1657 "$TMPDIR/$path.map" 1886 "$TMPDIR/$path.map"
1658} 1887}
1659 1888
1660# the unique path, undef == no special unique path 1889# the unique path, undef == no special unique path
1661sub uniq_path { 1890sub uniq_path {
1662 my ($self) = @_; 1891 my ($self) = @_;
1663 1892
1664 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1893 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1665 "$UNIQUEDIR/$path" 1894 "$UNIQUEDIR/$path"
1666}
1667
1668# and all this just because we cannot iterate over
1669# all maps in C++...
1670sub change_all_map_light {
1671 my ($change) = @_;
1672
1673 $_->change_map_light ($change)
1674 for grep $_->outdoor, values %cf::MAP;
1675} 1895}
1676 1896
1677sub decay_objects { 1897sub decay_objects {
1678 my ($self) = @_; 1898 my ($self) = @_;
1679 1899
… …
1692 1912
1693sub load_header_from($) { 1913sub load_header_from($) {
1694 my ($self, $path) = @_; 1914 my ($self, $path) = @_;
1695 1915
1696 utf8::encode $path; 1916 utf8::encode $path;
1697 #aio_open $path, O_RDONLY, 0 1917 my $f = new_from_file cf::object::thawer $path
1698 # or return;
1699
1700 $self->_load_header ($path)
1701 or return; 1918 or return;
1919
1920 $self->_load_header ($f)
1921 or return;
1922
1923 local $MAP_LOADING{$self->{path}} = $self;
1924 $f->resolve_delayed_derefs;
1702 1925
1703 $self->{load_path} = $path; 1926 $self->{load_path} = $path;
1704 1927
1705 1 1928 1
1706} 1929}
… …
1760sub find { 1983sub find {
1761 my ($path, $origin) = @_; 1984 my ($path, $origin) = @_;
1762 1985
1763 $path = normalise $path, $origin && $origin->path; 1986 $path = normalise $path, $origin && $origin->path;
1764 1987
1988 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1765 cf::lock_wait "map_find:$path"; 1989 my $guard2 = cf::lock_acquire "map_find:$path";
1766 1990
1767 $cf::MAP{$path} || do { 1991 $cf::MAP{$path} || do {
1768 my $guard = cf::lock_acquire "map_find:$path";
1769 my $map = new_from_path cf::map $path 1992 my $map = new_from_path cf::map $path
1770 or return; 1993 or return;
1771 1994
1772 $map->{last_save} = $cf::RUNTIME; 1995 $map->{last_save} = $cf::RUNTIME;
1773 1996
… …
1775 or return; 1998 or return;
1776 1999
1777 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2000 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1778 # doing this can freeze the server in a sync job, obviously 2001 # doing this can freeze the server in a sync job, obviously
1779 #$cf::WAIT_FOR_TICK->wait; 2002 #$cf::WAIT_FOR_TICK->wait;
2003 undef $guard2;
2004 undef $guard1;
1780 $map->reset; 2005 $map->reset;
1781 undef $guard;
1782 return find $path; 2006 return find $path;
1783 } 2007 }
1784 2008
1785 $cf::MAP{$path} = $map 2009 $cf::MAP{$path} = $map
1786 } 2010 }
… …
1795 local $self->{deny_reset} = 1; # loading can take a long time 2019 local $self->{deny_reset} = 1; # loading can take a long time
1796 2020
1797 my $path = $self->{path}; 2021 my $path = $self->{path};
1798 2022
1799 { 2023 {
1800 my $guard = cf::lock_acquire "map_load:$path"; 2024 my $guard = cf::lock_acquire "map_data:$path";
1801 2025
2026 return unless $self->valid;
1802 return if $self->in_memory != cf::MAP_SWAPPED; 2027 return unless $self->in_memory == cf::MAP_SWAPPED;
1803 2028
1804 $self->in_memory (cf::MAP_LOADING); 2029 $self->in_memory (cf::MAP_LOADING);
1805 2030
1806 $self->alloc; 2031 $self->alloc;
1807 2032
1808 $self->pre_load; 2033 $self->pre_load;
1809 Coro::cede; 2034 cf::cede_to_tick;
1810 2035
2036 my $f = new_from_file cf::object::thawer $self->{load_path};
2037 $f->skip_block;
1811 $self->_load_objects ($self->{load_path}, 1) 2038 $self->_load_objects ($f)
1812 or return; 2039 or return;
1813 2040
1814 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2041 $self->post_load_original
1815 if delete $self->{load_original}; 2042 if delete $self->{load_original};
1816 2043
1817 if (my $uniq = $self->uniq_path) { 2044 if (my $uniq = $self->uniq_path) {
1818 utf8::encode $uniq; 2045 utf8::encode $uniq;
1819 if (aio_open $uniq, O_RDONLY, 0) { 2046 unless (aio_stat $uniq) {
2047 if (my $f = new_from_file cf::object::thawer $uniq) {
1820 $self->clear_unique_items; 2048 $self->clear_unique_items;
1821 $self->_load_objects ($uniq, 0); 2049 $self->_load_objects ($f);
2050 $f->resolve_delayed_derefs;
2051 }
1822 } 2052 }
1823 } 2053 }
1824 2054
1825 Coro::cede; 2055 $f->resolve_delayed_derefs;
2056
2057 cf::cede_to_tick;
1826 # now do the right thing for maps 2058 # now do the right thing for maps
1827 $self->link_multipart_objects; 2059 $self->link_multipart_objects;
1828 $self->difficulty ($self->estimate_difficulty) 2060 $self->difficulty ($self->estimate_difficulty)
1829 unless $self->difficulty; 2061 unless $self->difficulty;
1830 Coro::cede; 2062 cf::cede_to_tick;
1831 2063
1832 unless ($self->{deny_activate}) { 2064 unless ($self->{deny_activate}) {
1833 $self->decay_objects; 2065 $self->decay_objects;
1834 $self->fix_auto_apply; 2066 $self->fix_auto_apply;
1835 $self->update_buttons; 2067 $self->update_buttons;
1836 Coro::cede; 2068 cf::cede_to_tick;
1837 $self->set_darkness_map;
1838 Coro::cede;
1839 $self->activate; 2069 $self->activate;
1840 } 2070 }
1841 2071
2072 $self->{last_save} = $cf::RUNTIME;
2073 $self->last_access ($cf::RUNTIME);
2074
1842 $self->in_memory (cf::MAP_IN_MEMORY); 2075 $self->in_memory (cf::MAP_ACTIVE);
1843 } 2076 }
1844 2077
1845 $self->post_load; 2078 $self->post_load;
1846} 2079}
1847 2080
… …
1856 2089
1857 $self 2090 $self
1858} 2091}
1859 2092
1860# find and load all maps in the 3x3 area around a map 2093# find and load all maps in the 3x3 area around a map
1861sub load_diag { 2094sub load_neighbours {
1862 my ($map) = @_; 2095 my ($map) = @_;
1863 2096
1864 my @diag; # diagonal neighbours 2097 my @neigh; # diagonal neighbours
1865 2098
1866 for (0 .. 3) { 2099 for (0 .. 3) {
1867 my $neigh = $map->tile_path ($_) 2100 my $neigh = $map->tile_path ($_)
1868 or next; 2101 or next;
1869 $neigh = find $neigh, $map 2102 $neigh = find $neigh, $map
1870 or next; 2103 or next;
1871 $neigh->load; 2104 $neigh->load;
1872 2105
2106 push @neigh,
1873 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2107 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1874 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2108 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1875 } 2109 }
1876 2110
1877 for (@diag) { 2111 for (grep defined $_->[0], @neigh) {
2112 my ($path, $origin) = @$_;
1878 my $neigh = find @$_ 2113 my $neigh = find $path, $origin
1879 or next; 2114 or next;
1880 $neigh->load; 2115 $neigh->load;
1881 } 2116 }
1882} 2117}
1883 2118
… …
1888} 2123}
1889 2124
1890sub do_load_sync { 2125sub do_load_sync {
1891 my ($map) = @_; 2126 my ($map) = @_;
1892 2127
2128 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2129 if $Coro::current == $Coro::main;
2130
1893 cf::sync_job { $map->load }; 2131 cf::sync_job { $map->load };
1894} 2132}
1895 2133
1896our %MAP_PREFETCH; 2134our %MAP_PREFETCH;
1897our $MAP_PREFETCHER = undef; 2135our $MAP_PREFETCHER = undef;
1898 2136
1899sub find_async { 2137sub find_async {
1900 my ($path, $origin) = @_; 2138 my ($path, $origin, $load) = @_;
1901 2139
1902 $path = normalise $path, $origin && $origin->{path}; 2140 $path = normalise $path, $origin && $origin->{path};
1903 2141
1904 if (my $map = $cf::MAP{$path}) { 2142 if (my $map = $cf::MAP{$path}) {
1905 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2143 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1906 } 2144 }
1907 2145
1908 undef $MAP_PREFETCH{$path}; 2146 $MAP_PREFETCH{$path} |= $load;
2147
1909 $MAP_PREFETCHER ||= cf::async { 2148 $MAP_PREFETCHER ||= cf::async {
2149 $Coro::current->{desc} = "map prefetcher";
2150
1910 while (%MAP_PREFETCH) { 2151 while (%MAP_PREFETCH) {
1911 for my $path (keys %MAP_PREFETCH) { 2152 while (my ($k, $v) = each %MAP_PREFETCH) {
1912 if (my $map = find $path) { 2153 if (my $map = find $k) {
1913 $map->load; 2154 $map->load if $v;
1914 } 2155 }
1915 2156
1916 delete $MAP_PREFETCH{$path}; 2157 delete $MAP_PREFETCH{$k};
1917 } 2158 }
1918 } 2159 }
1919 undef $MAP_PREFETCHER; 2160 undef $MAP_PREFETCHER;
1920 }; 2161 };
1921 $MAP_PREFETCHER->prio (6); 2162 $MAP_PREFETCHER->prio (6);
… …
1924} 2165}
1925 2166
1926sub save { 2167sub save {
1927 my ($self) = @_; 2168 my ($self) = @_;
1928 2169
1929 my $lock = cf::lock_acquire "map_data:" . $self->path; 2170 my $lock = cf::lock_acquire "map_data:$self->{path}";
1930 2171
1931 $self->{last_save} = $cf::RUNTIME; 2172 $self->{last_save} = $cf::RUNTIME;
1932 2173
1933 return unless $self->dirty; 2174 return unless $self->dirty;
1934 2175
… …
1940 return if $self->{deny_save}; 2181 return if $self->{deny_save};
1941 2182
1942 local $self->{last_access} = $self->last_access;#d# 2183 local $self->{last_access} = $self->last_access;#d#
1943 2184
1944 cf::async { 2185 cf::async {
2186 $Coro::current->{desc} = "map player save";
1945 $_->contr->save for $self->players; 2187 $_->contr->save for $self->players;
1946 }; 2188 };
2189
2190 cf::get_slot 0.02;
1947 2191
1948 if ($uniq) { 2192 if ($uniq) {
1949 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2193 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1950 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2194 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1951 } else { 2195 } else {
… …
1957 my ($self) = @_; 2201 my ($self) = @_;
1958 2202
1959 # save first because save cedes 2203 # save first because save cedes
1960 $self->save; 2204 $self->save;
1961 2205
1962 my $lock = cf::lock_acquire "map_data:" . $self->path; 2206 my $lock = cf::lock_acquire "map_data:$self->{path}";
1963 2207
1964 return if $self->players; 2208 return if $self->players;
1965 return if $self->in_memory != cf::MAP_IN_MEMORY; 2209 return if $self->in_memory != cf::MAP_ACTIVE;
1966 return if $self->{deny_save}; 2210 return if $self->{deny_save};
1967 2211
2212 $self->in_memory (cf::MAP_SWAPPED);
2213
2214 $self->deactivate;
2215 $_->clear_links_to ($self) for values %cf::MAP;
1968 $self->clear; 2216 $self->clear;
1969 $self->in_memory (cf::MAP_SWAPPED);
1970} 2217}
1971 2218
1972sub reset_at { 2219sub reset_at {
1973 my ($self) = @_; 2220 my ($self) = @_;
1974 2221
… …
1992 2239
1993 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2240 my $lock = cf::lock_acquire "map_data:$self->{path}";
1994 2241
1995 return if $self->players; 2242 return if $self->players;
1996 2243
1997 warn "resetting map ", $self->path; 2244 warn "resetting map ", $self->path, "\n";
1998 2245
1999 $self->in_memory (cf::MAP_SWAPPED); 2246 $self->in_memory (cf::MAP_SWAPPED);
2000 2247
2001 # need to save uniques path 2248 # need to save uniques path
2002 unless ($self->{deny_save}) { 2249 unless ($self->{deny_save}) {
… …
2006 if $uniq; 2253 if $uniq;
2007 } 2254 }
2008 2255
2009 delete $cf::MAP{$self->path}; 2256 delete $cf::MAP{$self->path};
2010 2257
2258 $self->deactivate;
2259 $_->clear_links_to ($self) for values %cf::MAP;
2011 $self->clear; 2260 $self->clear;
2012
2013 $_->clear_links_to ($self) for values %cf::MAP;
2014 2261
2015 $self->unlink_save; 2262 $self->unlink_save;
2016 $self->destroy; 2263 $self->destroy;
2017} 2264}
2018 2265
2019my $nuke_counter = "aaaa"; 2266my $nuke_counter = "aaaa";
2020 2267
2021sub nuke { 2268sub nuke {
2022 my ($self) = @_; 2269 my ($self) = @_;
2023 2270
2271 {
2272 my $lock = cf::lock_acquire "map_data:$self->{path}";
2273
2024 delete $cf::MAP{$self->path}; 2274 delete $cf::MAP{$self->path};
2025 2275
2026 $self->unlink_save; 2276 $self->unlink_save;
2027 2277
2028 bless $self, "cf::map"; 2278 bless $self, "cf::map";
2029 delete $self->{deny_reset}; 2279 delete $self->{deny_reset};
2030 $self->{deny_save} = 1; 2280 $self->{deny_save} = 1;
2031 $self->reset_timeout (1); 2281 $self->reset_timeout (1);
2032 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2282 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2033 2283
2034 $cf::MAP{$self->path} = $self; 2284 $cf::MAP{$self->path} = $self;
2285 }
2035 2286
2036 $self->reset; # polite request, might not happen 2287 $self->reset; # polite request, might not happen
2037} 2288}
2038 2289
2039=item $maps = cf::map::tmp_maps 2290=item $maps = cf::map::tmp_maps
… …
2081 2332
2082sub unique_maps() { 2333sub unique_maps() {
2083 [ 2334 [
2084 map { 2335 map {
2085 utf8::decode $_; 2336 utf8::decode $_;
2086 /\.map$/ 2337 s/\.map$//; # TODO future compatibility hack
2338 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2339 ? ()
2087 ? normalise $_ 2340 : normalise $_
2088 : ()
2089 } @{ aio_readdir $UNIQUEDIR or [] } 2341 } @{ aio_readdir $UNIQUEDIR or [] }
2090 ] 2342 ]
2091} 2343}
2092 2344
2093package cf;
2094
2095=back 2345=back
2096 2346
2097=head3 cf::object 2347=head3 cf::object
2098 2348
2099=cut 2349=cut
… …
2102 2352
2103=over 4 2353=over 4
2104 2354
2105=item $ob->inv_recursive 2355=item $ob->inv_recursive
2106 2356
2107Returns the inventory of the object _and_ their inventories, recursively. 2357Returns the inventory of the object I<and> their inventories, recursively,
2358but I<not> the object itself.
2108 2359
2109=cut 2360=cut
2110 2361
2111sub inv_recursive_; 2362sub inv_recursive_;
2112sub inv_recursive_ { 2363sub inv_recursive_ {
… …
2115 2366
2116sub inv_recursive { 2367sub inv_recursive {
2117 inv_recursive_ inv $_[0] 2368 inv_recursive_ inv $_[0]
2118} 2369}
2119 2370
2371=item $ref = $ob->ref
2372
2373Creates and returns a persistent reference to an object that can be stored as a string.
2374
2375=item $ob = cf::object::deref ($refstring)
2376
2377returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2378even if the object actually exists. May block.
2379
2380=cut
2381
2382sub deref {
2383 my ($ref) = @_;
2384
2385 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2386 my ($uuid, $name) = ($1, $2);
2387 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2388 or return;
2389 $pl->ob->uuid eq $uuid
2390 or return;
2391
2392 $pl->ob
2393 } else {
2394 warn "$ref: cannot resolve object reference\n";
2395 undef
2396 }
2397}
2398
2120package cf; 2399package cf;
2121 2400
2122=back 2401=back
2123 2402
2124=head3 cf::object::player 2403=head3 cf::object::player
… …
2130Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2409Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2131can be C<undef>. Does the right thing when the player is currently in a 2410can be C<undef>. Does the right thing when the player is currently in a
2132dialogue with the given NPC character. 2411dialogue with the given NPC character.
2133 2412
2134=cut 2413=cut
2414
2415our $SAY_CHANNEL = {
2416 id => "say",
2417 title => "Map",
2418 reply => "say ",
2419 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2420};
2421
2422our $CHAT_CHANNEL = {
2423 id => "chat",
2424 title => "Chat",
2425 reply => "chat ",
2426 tooltip => "Player chat and shouts, global to the server.",
2427};
2135 2428
2136# rough implementation of a future "reply" method that works 2429# rough implementation of a future "reply" method that works
2137# with dialog boxes. 2430# with dialog boxes.
2138#TODO: the first argument must go, split into a $npc->reply_to ( method 2431#TODO: the first argument must go, split into a $npc->reply_to ( method
2139sub cf::object::player::reply($$$;$) { 2432sub cf::object::player::reply($$$;$) {
… …
2146 2439
2147 } else { 2440 } else {
2148 my $pl = $self->contr; 2441 my $pl = $self->contr;
2149 2442
2150 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2443 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151 my $diag = $pl->{npc_dialog}; 2444 my $dialog = $pl->{npc_dialog};
2152 $diag->{pl}->ext_reply ( 2445 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2153 $diag->{id},
2154 msgtype => "reply",
2155 msg => $diag->{pl}->expand_cfpod ($msg),
2156 add_topics => []
2157 );
2158 2446
2159 } else { 2447 } else {
2160 $msg = $npc->name . " says: $msg" if $npc; 2448 $msg = $npc->name . " says: $msg" if $npc;
2161 $self->message ($msg, $flags); 2449 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2162 } 2450 }
2163 } 2451 }
2452}
2453
2454=item $object->send_msg ($channel, $msg, $color, [extra...])
2455
2456=cut
2457
2458sub cf::object::send_msg {
2459 my $pl = shift->contr
2460 or return;
2461 $pl->send_msg (@_);
2164} 2462}
2165 2463
2166=item $player_object->may ("access") 2464=item $player_object->may ("access")
2167 2465
2168Returns wether the given player is authorized to access resource "access" 2466Returns wether the given player is authorized to access resource "access"
… …
2181 2479
2182=item $player_object->enter_link 2480=item $player_object->enter_link
2183 2481
2184Freezes the player and moves him/her to a special map (C<{link}>). 2482Freezes the player and moves him/her to a special map (C<{link}>).
2185 2483
2186The player should be reasonably safe there for short amounts of time. You 2484The player should be reasonably safe there for short amounts of time (e.g.
2187I<MUST> call C<leave_link> as soon as possible, though. 2485for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2486though, as the palyer cannot control the character while it is on the link
2487map.
2188 2488
2189Will never block. 2489Will never block.
2190 2490
2191=item $player_object->leave_link ($map, $x, $y) 2491=item $player_object->leave_link ($map, $x, $y)
2192 2492
… …
2247 # use -1 or undef as default coordinates, not 0, 0 2547 # use -1 or undef as default coordinates, not 0, 0
2248 ($x, $y) = ($map->enter_x, $map->enter_y) 2548 ($x, $y) = ($map->enter_x, $map->enter_y)
2249 if $x <=0 && $y <= 0; 2549 if $x <=0 && $y <= 0;
2250 2550
2251 $map->load; 2551 $map->load;
2252 $map->load_diag; 2552 $map->load_neighbours;
2253 2553
2254 return unless $self->contr->active; 2554 return unless $self->contr->active;
2255 $self->activate_recursive;
2256 2555
2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2556 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2258 $self->enter_map ($map, $x, $y); 2557 $self->enter_map ($map, $x, $y);
2558
2559 # only activate afterwards, to support waiting in hooks
2560 $self->activate_recursive;
2259} 2561}
2260 2562
2261=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2563=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2262 2564
2263Moves the player to the given map-path and coordinates by first freezing 2565Moves the player to the given map-path and coordinates by first freezing
2264her, loading and preparing them map, calling the provided $check callback 2566her, loading and preparing them map, calling the provided $check callback
2265that has to return the map if sucecssful, and then unfreezes the player on 2567that has to return the map if sucecssful, and then unfreezes the player on
2266the new (success) or old (failed) map position. In either case, $done will 2568the new (success) or old (failed) map position. In either case, $done will
2267be called at the end of this process. 2569be called at the end of this process.
2268 2570
2571Note that $check will be called with a potentially non-loaded map, so if
2572it needs a loaded map it has to call C<< ->load >>.
2573
2269=cut 2574=cut
2270 2575
2271our $GOTOGEN; 2576our $GOTOGEN;
2272 2577
2273sub cf::object::player::goto { 2578sub cf::object::player::goto {
… …
2277 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2582 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2278 2583
2279 $self->enter_link; 2584 $self->enter_link;
2280 2585
2281 (async { 2586 (async {
2587 $Coro::current->{desc} = "player::goto $path $x $y";
2588
2589 # *tag paths override both path and x|y
2590 if ($path =~ /^\*(.*)$/) {
2591 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2592 my $ob = $obs[rand @obs];
2593
2594 # see if we actually can go there
2595 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2596 $ob = $obs[rand @obs];
2597 } else {
2598 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2599 }
2600 # else put us there anyways for now #d#
2601
2602 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2603 } else {
2604 ($path, $x, $y) = (undef, undef, undef);
2605 }
2606 }
2607
2282 my $map = eval { 2608 my $map = eval {
2283 my $map = cf::map::find $path; 2609 my $map = defined $path ? cf::map::find $path : undef;
2284 2610
2285 if ($map) { 2611 if ($map) {
2286 $map = $map->customise_for ($self); 2612 $map = $map->customise_for ($self);
2287 $map = $check->($map) if $check && $map; 2613 $map = $check->($map) if $check && $map;
2288 } else { 2614 } else {
2289 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2615 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2290 } 2616 }
2291 2617
2292 $map 2618 $map
2293 }; 2619 };
2294 2620
… …
2330} 2656}
2331 2657
2332sub prepare_random_map { 2658sub prepare_random_map {
2333 my ($exit) = @_; 2659 my ($exit) = @_;
2334 2660
2335 my $guard = cf::lock_acquire "exit_prepare:$exit";
2336
2337 # all this does is basically replace the /! path by 2661 # all this does is basically replace the /! path by
2338 # a new random map path (?random/...) with a seed 2662 # a new random map path (?random/...) with a seed
2339 # that depends on the exit object 2663 # that depends on the exit object
2340 2664
2341 my $rmp = parse_random_map_params $exit->msg; 2665 my $rmp = parse_random_map_params $exit->msg;
… …
2343 if ($exit->map) { 2667 if ($exit->map) {
2344 $rmp->{region} = $exit->region->name; 2668 $rmp->{region} = $exit->region->name;
2345 $rmp->{origin_map} = $exit->map->path; 2669 $rmp->{origin_map} = $exit->map->path;
2346 $rmp->{origin_x} = $exit->x; 2670 $rmp->{origin_x} = $exit->x;
2347 $rmp->{origin_y} = $exit->y; 2671 $rmp->{origin_y} = $exit->y;
2672
2673 $exit->map->touch;
2348 } 2674 }
2349 2675
2350 $rmp->{random_seed} ||= $exit->random_seed; 2676 $rmp->{random_seed} ||= $exit->random_seed;
2351 2677
2352 my $data = cf::to_json $rmp; 2678 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2353 my $md5 = Digest::MD5::md5_hex $data; 2679 my $md5 = Digest::MD5::md5_hex $data;
2354 my $meta = "$RANDOMDIR/$md5.meta"; 2680 my $meta = "$RANDOMDIR/$md5.meta";
2355 2681
2356 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2682 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2357 aio_write $fh, 0, (length $data), $data, 0; 2683 aio_write $fh, 0, (length $data), $data, 0;
2358 undef $fh; 2684 undef $fh;
2359 aio_rename "$meta~", $meta; 2685 aio_rename "$meta~", $meta;
2360 2686
2687 my $slaying = "?random/$md5";
2688
2689 if ($exit->valid) {
2361 $exit->slaying ("?random/$md5"); 2690 $exit->slaying ("?random/$md5");
2362 $exit->msg (undef); 2691 $exit->msg (undef);
2692 }
2363 } 2693 }
2364} 2694}
2365 2695
2366sub cf::object::player::enter_exit { 2696sub cf::object::player::enter_exit {
2367 my ($self, $exit) = @_; 2697 my ($self, $exit) = @_;
2368 2698
2369 return unless $self->type == cf::PLAYER; 2699 return unless $self->type == cf::PLAYER;
2370 2700
2371 if ($exit->slaying eq "/!") {
2372 #TODO: this should de-fi-ni-te-ly not be a sync-job
2373 # the problem is that $exit might not survive long enough
2374 # so it needs to be done right now, right here
2375 cf::sync_job { prepare_random_map $exit };
2376 }
2377
2378 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2379 my $hp = $exit->stats->hp;
2380 my $sp = $exit->stats->sp;
2381
2382 $self->enter_link; 2701 $self->enter_link;
2383 2702
2384 # if exit is damned, update players death & WoR home-position
2385 $self->contr->savebed ($slaying, $hp, $sp)
2386 if $exit->flag (FLAG_DAMNED);
2387
2388 (async { 2703 (async {
2389 $self->deactivate_recursive; # just to be sure 2704 $Coro::current->{desc} = "enter_exit";
2705
2390 unless (eval { 2706 unless (eval {
2707 $self->deactivate_recursive; # just to be sure
2708
2709 # random map handling
2710 {
2711 my $guard = cf::lock_acquire "exit_prepare:$exit";
2712
2713 prepare_random_map $exit
2714 if $exit->slaying eq "/!";
2715 }
2716
2717 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2718 my $x = $exit->stats->hp;
2719 my $y = $exit->stats->sp;
2720
2391 $self->goto ($slaying, $hp, $sp); 2721 $self->goto ($map, $x, $y);
2392 2722
2723 # if exit is damned, update players death & WoR home-position
2724 $self->contr->savebed ($map, $x, $y)
2725 if $exit->flag (cf::FLAG_DAMNED);
2726
2393 1; 2727 1
2394 }) { 2728 }) {
2395 $self->message ("Something went wrong deep within the crossfire server. " 2729 $self->message ("Something went wrong deep within the deliantra server. "
2396 . "I'll try to bring you back to the map you were before. " 2730 . "I'll try to bring you back to the map you were before. "
2397 . "Please report this to the dungeon master!", 2731 . "Please report this to the dungeon master!",
2398 cf::NDI_UNIQUE | cf::NDI_RED); 2732 cf::NDI_UNIQUE | cf::NDI_RED);
2399 2733
2400 warn "ERROR in enter_exit: $@"; 2734 warn "ERROR in enter_exit: $@";
… …
2419 2753
2420 utf8::encode $text; 2754 utf8::encode $text;
2421 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2755 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2422} 2756}
2423 2757
2424=item $client->send_msg ($color, $type, $msg, [extra...]) 2758=item $client->send_msg ($channel, $msg, $color, [extra...])
2425 2759
2426Send a drawinfo or msg packet to the client, formatting the msg for the 2760Send a drawinfo or msg packet to the client, formatting the msg for the
2427client if neccessary. C<$type> should be a string identifying the type of 2761client if neccessary. C<$type> should be a string identifying the type of
2428the message, with C<log> being the default. If C<$color> is negative, suppress 2762the message, with C<log> being the default. If C<$color> is negative, suppress
2429the message unless the client supports the msg packet. 2763the message unless the client supports the msg packet.
2430 2764
2431=cut 2765=cut
2432 2766
2767# non-persistent channels (usually the info channel)
2768our %CHANNEL = (
2769 "c/identify" => {
2770 id => "infobox",
2771 title => "Identify",
2772 reply => undef,
2773 tooltip => "Items recently identified",
2774 },
2775 "c/examine" => {
2776 id => "infobox",
2777 title => "Examine",
2778 reply => undef,
2779 tooltip => "Signs and other items you examined",
2780 },
2781 "c/book" => {
2782 id => "infobox",
2783 title => "Book",
2784 reply => undef,
2785 tooltip => "The contents of a note or book",
2786 },
2787 "c/lookat" => {
2788 id => "infobox",
2789 title => "Look",
2790 reply => undef,
2791 tooltip => "What you saw there",
2792 },
2793 "c/who" => {
2794 id => "infobox",
2795 title => "Players",
2796 reply => undef,
2797 tooltip => "Shows players who are currently online",
2798 },
2799 "c/body" => {
2800 id => "infobox",
2801 title => "Body Parts",
2802 reply => undef,
2803 tooltip => "Shows which body parts you posess and are available",
2804 },
2805 "c/statistics" => {
2806 id => "infobox",
2807 title => "Statistics",
2808 reply => undef,
2809 tooltip => "Shows your primary statistics",
2810 },
2811 "c/skills" => {
2812 id => "infobox",
2813 title => "Skills",
2814 reply => undef,
2815 tooltip => "Shows your experience per skill and item power",
2816 },
2817 "c/shopitems" => {
2818 id => "infobox",
2819 title => "Shop Items",
2820 reply => undef,
2821 tooltip => "Shows the items currently for sale in this shop",
2822 },
2823 "c/resistances" => {
2824 id => "infobox",
2825 title => "Resistances",
2826 reply => undef,
2827 tooltip => "Shows your resistances",
2828 },
2829 "c/pets" => {
2830 id => "infobox",
2831 title => "Pets",
2832 reply => undef,
2833 tooltip => "Shows information abotu your pets/a specific pet",
2834 },
2835 "c/perceiveself" => {
2836 id => "infobox",
2837 title => "Perceive Self",
2838 reply => undef,
2839 tooltip => "You gained detailed knowledge about yourself",
2840 },
2841 "c/uptime" => {
2842 id => "infobox",
2843 title => "Uptime",
2844 reply => undef,
2845 tooltip => "How long the server has been running since last restart",
2846 },
2847 "c/mapinfo" => {
2848 id => "infobox",
2849 title => "Map Info",
2850 reply => undef,
2851 tooltip => "Information related to the maps",
2852 },
2853 "c/party" => {
2854 id => "party",
2855 title => "Party",
2856 reply => "gsay ",
2857 tooltip => "Messages and chat related to your party",
2858 },
2859 "c/death" => {
2860 id => "death",
2861 title => "Death",
2862 reply => undef,
2863 tooltip => "Reason for and more info about your most recent death",
2864 },
2865 "c/say" => $SAY_CHANNEL,
2866 "c/chat" => $CHAT_CHANNEL,
2867);
2868
2433sub cf::client::send_msg { 2869sub cf::client::send_msg {
2434 my ($self, $color, $type, $msg, @extra) = @_; 2870 my ($self, $channel, $msg, $color, @extra) = @_;
2435 2871
2436 $msg = $self->pl->expand_cfpod ($msg); 2872 $msg = $self->pl->expand_cfpod ($msg)
2873 unless $color & cf::NDI_VERBATIM;
2874
2875 $color &= cf::NDI_CLIENT_MASK; # just in case...
2876
2877 # check predefined channels, for the benefit of C
2878 if ($CHANNEL{$channel}) {
2879 $channel = $CHANNEL{$channel};
2880
2881 $self->ext_msg (channel_info => $channel);
2882 $channel = $channel->{id};
2883
2884 } elsif (ref $channel) {
2885 # send meta info to client, if not yet sent
2886 unless (exists $self->{channel}{$channel->{id}}) {
2887 $self->{channel}{$channel->{id}} = $channel;
2888 $self->ext_msg (channel_info => $channel);
2889 }
2890
2891 $channel = $channel->{id};
2892 }
2437 2893
2438 return unless @extra || length $msg; 2894 return unless @extra || length $msg;
2439 2895
2440 if ($self->can_msg) { 2896 # default colour, mask it out
2441 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2897 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2442 } else { 2898 if $color & cf::NDI_DEF;
2443 # replace some tags by gcfclient-compatible ones
2444 for ($msg) {
2445 1 while
2446 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2447 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2448 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2449 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2450 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2451 }
2452 2899
2453 if ($color >= 0) { 2900 my $pkt = "msg "
2454 if (0 && $msg =~ /\[/) { 2901 . $self->{json_coder}->encode (
2455 $self->send_packet ("drawextinfo $color 4 0 $msg") 2902 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2456 } else { 2903 );
2457 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2458 $self->send_packet ("drawinfo $color $msg")
2459 }
2460 }
2461 }
2462}
2463 2904
2905 # try lzf for large packets
2906 $pkt = "lzf " . Compress::LZF::compress $pkt
2907 if 1024 <= length $pkt and $self->{can_lzf};
2908
2909 # split very large packets
2910 if (8192 < length $pkt and $self->{can_lzf}) {
2911 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2912 $pkt = "frag";
2913 }
2914
2915 $self->send_packet ($pkt);
2916}
2917
2464=item $client->ext_event ($type, %msg) 2918=item $client->ext_msg ($type, @msg)
2465 2919
2466Sends an ext event to the client. 2920Sends an ext event to the client.
2467 2921
2468=cut 2922=cut
2469 2923
2470sub cf::client::ext_event($$%) { 2924sub cf::client::ext_msg($$@) {
2471 my ($self, $type, %msg) = @_; 2925 my ($self, $type, @msg) = @_;
2472 2926
2473 return unless $self->extcmd; 2927 if ($self->extcmd == 2) {
2474 2928 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2929 } elsif ($self->extcmd == 1) { # TODO: remove
2475 $msg{msgtype} = "event_$type"; 2930 push @msg, msgtype => "event_$type";
2476 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2931 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2932 }
2933}
2934
2935=item $client->ext_reply ($msgid, @msg)
2936
2937Sends an ext reply to the client.
2938
2939=cut
2940
2941sub cf::client::ext_reply($$@) {
2942 my ($self, $id, @msg) = @_;
2943
2944 if ($self->extcmd == 2) {
2945 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2946 } elsif ($self->extcmd == 1) {
2947 #TODO: version 1, remove
2948 unshift @msg, msgtype => "reply", msgid => $id;
2949 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2950 }
2477} 2951}
2478 2952
2479=item $success = $client->query ($flags, "text", \&cb) 2953=item $success = $client->query ($flags, "text", \&cb)
2480 2954
2481Queues a query to the client, calling the given callback with 2955Queues a query to the client, calling the given callback with
… …
2536 my ($ns, $buf) = @_; 3010 my ($ns, $buf) = @_;
2537 3011
2538 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3012 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2539 3013
2540 if (ref $msg) { 3014 if (ref $msg) {
3015 my ($type, $reply, @payload) =
3016 "ARRAY" eq ref $msg
3017 ? @$msg
3018 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3019
3020 my @reply;
3021
2541 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3022 if (my $cb = $EXTICMD{$type}) {
2542 if (my %reply = $cb->($ns, $msg)) { 3023 @reply = $cb->($ns, @payload);
2543 $reply{msgid} = $msg->{msgid};
2544 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2545 }
2546 } 3024 }
3025
3026 $ns->ext_reply ($reply, @reply)
3027 if $reply;
3028
2547 } else { 3029 } else {
2548 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3030 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2549 } 3031 }
2550 3032
2551 cf::override; 3033 cf::override;
… …
2598our $safe = new Safe "safe"; 3080our $safe = new Safe "safe";
2599our $safe_hole = new Safe::Hole; 3081our $safe_hole = new Safe::Hole;
2600 3082
2601$SIG{FPE} = 'IGNORE'; 3083$SIG{FPE} = 'IGNORE';
2602 3084
2603$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3085$safe->permit_only (Opcode::opset qw(
3086 :base_core :base_mem :base_orig :base_math
3087 grepstart grepwhile mapstart mapwhile
3088 sort time
3089));
2604 3090
2605# here we export the classes and methods available to script code 3091# here we export the classes and methods available to script code
2606 3092
2607=pod 3093=pod
2608 3094
2609The following functions and methods are available within a safe environment: 3095The following functions and methods are available within a safe environment:
2610 3096
2611 cf::object 3097 cf::object
2612 contr pay_amount pay_player map x y force_find force_add 3098 contr pay_amount pay_player map x y force_find force_add destroy
2613 insert remove 3099 insert remove name archname title slaying race decrease split
3100 value
2614 3101
2615 cf::object::player 3102 cf::object::player
2616 player 3103 player
2617 3104
2618 cf::player 3105 cf::player
… …
2623 3110
2624=cut 3111=cut
2625 3112
2626for ( 3113for (
2627 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3114 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2628 insert remove)], 3115 insert remove inv nrof name archname title slaying race
3116 decrease split destroy change_exp value msg lore send_msg)],
2629 ["cf::object::player" => qw(player)], 3117 ["cf::object::player" => qw(player)],
2630 ["cf::player" => qw(peaceful)], 3118 ["cf::player" => qw(peaceful send_msg)],
2631 ["cf::map" => qw(trigger)], 3119 ["cf::map" => qw(trigger)],
2632) { 3120) {
2633 no strict 'refs'; 3121 no strict 'refs';
2634 my ($pkg, @funs) = @$_; 3122 my ($pkg, @funs) = @$_;
2635 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3123 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
2652 my ($code, %vars) = @_; 3140 my ($code, %vars) = @_;
2653 3141
2654 my $qcode = $code; 3142 my $qcode = $code;
2655 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3143 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2656 $qcode =~ s/\n/\\n/g; 3144 $qcode =~ s/\n/\\n/g;
3145
3146 %vars = (_dummy => 0) unless %vars;
2657 3147
2658 local $_; 3148 local $_;
2659 local @safe::cf::_safe_eval_args = values %vars; 3149 local @safe::cf::_safe_eval_args = values %vars;
2660 3150
2661 my $eval = 3151 my $eval =
… …
2709# the server's init and main functions 3199# the server's init and main functions
2710 3200
2711sub load_facedata($) { 3201sub load_facedata($) {
2712 my ($path) = @_; 3202 my ($path) = @_;
2713 3203
3204 # HACK to clear player env face cache, we need some signal framework
3205 # for this (global event?)
3206 %ext::player_env::MUSIC_FACE_CACHE = ();
3207
3208 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3209
2714 warn "loading facedata from $path\n"; 3210 warn "loading facedata from $path\n";
2715 3211
2716 my $facedata; 3212 my $facedata;
2717 0 < aio_load $path, $facedata 3213 0 < aio_load $path, $facedata
2718 or die "$path: $!"; 3214 or die "$path: $!";
… …
2720 $facedata = Coro::Storable::thaw $facedata; 3216 $facedata = Coro::Storable::thaw $facedata;
2721 3217
2722 $facedata->{version} == 2 3218 $facedata->{version} == 2
2723 or cf::cleanup "$path: version mismatch, cannot proceed."; 3219 or cf::cleanup "$path: version mismatch, cannot proceed.";
2724 3220
3221 # patch in the exptable
3222 $facedata->{resource}{"res/exp_table"} = {
3223 type => FT_RSRC,
3224 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3225 };
3226 cf::cede_to_tick;
3227
2725 { 3228 {
2726 my $faces = $facedata->{faceinfo}; 3229 my $faces = $facedata->{faceinfo};
2727 3230
2728 while (my ($face, $info) = each %$faces) { 3231 while (my ($face, $info) = each %$faces) {
2729 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3232 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3233
2730 cf::face::set_visibility $idx, $info->{visibility}; 3234 cf::face::set_visibility $idx, $info->{visibility};
2731 cf::face::set_magicmap $idx, $info->{magicmap}; 3235 cf::face::set_magicmap $idx, $info->{magicmap};
2732 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3236 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2733 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3237 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2734 3238
2735 cf::cede_to_tick; 3239 cf::cede_to_tick;
2736 } 3240 }
2737 3241
2738 while (my ($face, $info) = each %$faces) { 3242 while (my ($face, $info) = each %$faces) {
2739 next unless $info->{smooth}; 3243 next unless $info->{smooth};
3244
2740 my $idx = cf::face::find $face 3245 my $idx = cf::face::find $face
2741 or next; 3246 or next;
3247
2742 if (my $smooth = cf::face::find $info->{smooth}) { 3248 if (my $smooth = cf::face::find $info->{smooth}) {
2743 cf::face::set_smooth $idx, $smooth; 3249 cf::face::set_smooth $idx, $smooth;
2744 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3250 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2745 } else { 3251 } else {
2746 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3252 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
2763 3269
2764 { 3270 {
2765 # TODO: for gcfclient pleasure, we should give resources 3271 # TODO: for gcfclient pleasure, we should give resources
2766 # that gcfclient doesn't grok a >10000 face index. 3272 # that gcfclient doesn't grok a >10000 face index.
2767 my $res = $facedata->{resource}; 3273 my $res = $facedata->{resource};
2768 my $enc = JSON::XS->new->utf8->canonical;
2769 3274
2770 while (my ($name, $info) = each %$res) { 3275 while (my ($name, $info) = each %$res) {
2771 my $meta = $enc->encode ({ 3276 if (defined $info->{type}) {
2772 name => $name,
2773 type => $info->{type},
2774 copyright => $info->{copyright}, #TODO#
2775 });
2776
2777 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3277 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3278 my $data;
2778 3279
2779 if ($name =~ /\.jpg$/) { 3280 if ($info->{type} & 1) {
2780 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3281 # prepend meta info
2781 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3282
3283 my $meta = $enc->encode ({
3284 name => $name,
3285 %{ $info->{meta} || {} },
3286 });
3287
3288 $data = pack "(w/a*)*", $meta, $info->{data};
3289 } else {
3290 $data = $info->{data};
3291 }
3292
3293 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3294 cf::face::set_type $idx, $info->{type};
2782 } else { 3295 } else {
2783 my $data = pack "(w/a*)*", $meta, $info->{data}; 3296 $RESOURCE{$name} = $info;
2784 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2785
2786 cf::face::set_type $idx, 1;
2787 cf::face::set_data $idx, 0, $data, $chk;
2788 } 3297 }
2789 3298
2790 cf::cede_to_tick; 3299 cf::cede_to_tick;
2791 } 3300 }
2792 } 3301 }
2793 3302
3303 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3304
2794 1 3305 1
2795} 3306}
2796 3307
3308cf::global->attach (on_resource_update => sub {
3309 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3310 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3311
3312 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3313 my $sound = $soundconf->{compat}[$_]
3314 or next;
3315
3316 my $face = cf::face::find "sound/$sound->[1]";
3317 cf::sound::set $sound->[0] => $face;
3318 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3319 }
3320
3321 while (my ($k, $v) = each %{$soundconf->{event}}) {
3322 my $face = cf::face::find "sound/$v";
3323 cf::sound::set $k => $face;
3324 }
3325 }
3326});
3327
3328register_exticmd fx_want => sub {
3329 my ($ns, $want) = @_;
3330
3331 while (my ($k, $v) = each %$want) {
3332 $ns->fx_want ($k, $v);
3333 }
3334};
3335
3336sub load_resource_file($) {
3337 my $guard = lock_acquire "load_resource_file";
3338
3339 my $status = load_resource_file_ $_[0];
3340 get_slot 0.1, 100;
3341 cf::arch::commit_load;
3342
3343 $status
3344}
3345
2797sub reload_regions { 3346sub reload_regions {
3347 # HACK to clear player env face cache, we need some signal framework
3348 # for this (global event?)
3349 %ext::player_env::MUSIC_FACE_CACHE = ();
3350
2798 load_resource_file "$MAPDIR/regions" 3351 load_resource_file "$MAPDIR/regions"
2799 or die "unable to load regions file\n"; 3352 or die "unable to load regions file\n";
2800 3353
2801 for (cf::region::list) { 3354 for (cf::region::list) {
2802 $_->{match} = qr/$_->{match}/ 3355 $_->{match} = qr/$_->{match}/
… …
2810} 3363}
2811 3364
2812sub reload_archetypes { 3365sub reload_archetypes {
2813 load_resource_file "$DATADIR/archetypes" 3366 load_resource_file "$DATADIR/archetypes"
2814 or die "unable to load archetypes\n"; 3367 or die "unable to load archetypes\n";
2815 #d# NEED to laod twice to resolve forward references
2816 # this really needs to be done in an extra post-pass
2817 # (which needs to be synchronous, so solve it differently)
2818 load_resource_file "$DATADIR/archetypes"
2819 or die "unable to load archetypes\n";
2820} 3368}
2821 3369
2822sub reload_treasures { 3370sub reload_treasures {
2823 load_resource_file "$DATADIR/treasures" 3371 load_resource_file "$DATADIR/treasures"
2824 or die "unable to load treasurelists\n"; 3372 or die "unable to load treasurelists\n";
2825} 3373}
2826 3374
2827sub reload_resources { 3375sub reload_resources {
2828 warn "reloading resource files...\n"; 3376 warn "reloading resource files...\n";
2829 3377
3378 reload_facedata;
3379 reload_archetypes;
2830 reload_regions; 3380 reload_regions;
2831 reload_facedata;
2832 #reload_archetypes;#d#
2833 reload_archetypes;
2834 reload_treasures; 3381 reload_treasures;
2835 3382
2836 warn "finished reloading resource files\n"; 3383 warn "finished reloading resource files\n";
2837} 3384}
2838 3385
2839sub init { 3386sub reload_config {
2840 reload_resources;
2841}
2842
2843sub cfg_load {
2844 open my $fh, "<:utf8", "$CONFDIR/config" 3387 open my $fh, "<:utf8", "$CONFDIR/config"
2845 or return; 3388 or return;
2846 3389
2847 local $/; 3390 local $/;
2848 *CFG = YAML::Syck::Load <$fh>; 3391 *CFG = YAML::Load <$fh>;
2849 3392
2850 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3393 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2851 3394
2852 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3395 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2853 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3396 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
2859 }; 3402 };
2860 warn $@ if $@; 3403 warn $@ if $@;
2861 } 3404 }
2862} 3405}
2863 3406
3407sub pidfile() {
3408 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3409 or die "$PIDFILE: $!";
3410 flock $fh, &Fcntl::LOCK_EX
3411 or die "$PIDFILE: flock: $!";
3412 $fh
3413}
3414
3415# make sure only one server instance is running at any one time
3416sub atomic {
3417 my $fh = pidfile;
3418
3419 my $pid = <$fh>;
3420 kill 9, $pid if $pid > 0;
3421
3422 seek $fh, 0, 0;
3423 print $fh $$;
3424}
3425
3426sub main_loop {
3427 warn "EV::loop starting\n";
3428 if (1) {
3429 EV::loop;
3430 }
3431 warn "EV::loop returned\n";
3432 goto &main_loop unless $REALLY_UNLOOP;
3433}
3434
2864sub main { 3435sub main {
3436 cf::init_globals; # initialise logging
3437
3438 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3439 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3440 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3441 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3442
3443 cf::init_experience;
3444 cf::init_anim;
3445 cf::init_attackmess;
3446 cf::init_dynamic;
3447
3448 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3449
2865 # we must not ever block the main coroutine 3450 # we must not ever block the main coroutine
2866 local $Coro::idle = sub { 3451 local $Coro::idle = sub {
2867 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3452 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2868 (async { 3453 (async {
2869 Event::one_event; 3454 $Coro::current->{desc} = "IDLE BUG HANDLER";
3455 EV::loop EV::LOOP_ONESHOT;
2870 })->prio (Coro::PRIO_MAX); 3456 })->prio (Coro::PRIO_MAX);
2871 }; 3457 };
2872 3458
2873 cfg_load; 3459 evthread_start IO::AIO::poll_fileno;
3460
3461 cf::sync_job {
3462 reload_resources;
3463 reload_config;
2874 db_init; 3464 db_init;
3465
3466 cf::load_settings;
3467 cf::load_materials;
3468 cf::init_uuid;
3469 cf::init_signals;
3470 cf::init_commands;
3471 cf::init_skills;
3472
3473 cf::init_beforeplay;
3474
3475 atomic;
3476
2875 load_extensions; 3477 load_extensions;
2876 3478
2877 $TICK_WATCHER->start; 3479 utime time, time, $RUNTIMEFILE;
2878 Event::loop; 3480
3481 # no (long-running) fork's whatsoever before this point(!)
3482 use POSIX ();
3483 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3484
3485 (pop @POST_INIT)->(0) while @POST_INIT;
3486 };
3487
3488 main_loop;
2879} 3489}
2880 3490
2881############################################################################# 3491#############################################################################
2882# initialisation and cleanup 3492# initialisation and cleanup
2883 3493
2884# install some emergency cleanup handlers 3494# install some emergency cleanup handlers
2885BEGIN { 3495BEGIN {
3496 our %SIGWATCHER = ();
2886 for my $signal (qw(INT HUP TERM)) { 3497 for my $signal (qw(INT HUP TERM)) {
2887 Event->signal ( 3498 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2888 reentrant => 0,
2889 data => WF_AUTOCANCEL,
2890 signal => $signal,
2891 prio => 0,
2892 cb => sub {
2893 cf::cleanup "SIG$signal"; 3499 cf::cleanup "SIG$signal";
2894 },
2895 ); 3500 };
2896 } 3501 }
2897} 3502}
2898 3503
2899sub write_runtime { 3504sub write_runtime_sync {
2900 my $runtime = "$LOCALDIR/runtime";
2901
2902 # first touch the runtime file to show we are still running: 3505 # first touch the runtime file to show we are still running:
2903 # the fsync below can take a very very long time. 3506 # the fsync below can take a very very long time.
2904 3507
2905 IO::AIO::aio_utime $runtime, undef, undef; 3508 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2906 3509
2907 my $guard = cf::lock_acquire "write_runtime"; 3510 my $guard = cf::lock_acquire "write_runtime";
2908 3511
2909 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3512 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2910 or return; 3513 or return;
2911 3514
2912 my $value = $cf::RUNTIME + 90 + 10; 3515 my $value = $cf::RUNTIME + 90 + 10;
2913 # 10 is the runtime save interval, for a monotonic clock 3516 # 10 is the runtime save interval, for a monotonic clock
2914 # 60 allows for the watchdog to kill the server. 3517 # 60 allows for the watchdog to kill the server.
… …
2924 aio_utime $fh, undef, undef; 3527 aio_utime $fh, undef, undef;
2925 3528
2926 close $fh 3529 close $fh
2927 or return; 3530 or return;
2928 3531
2929 aio_rename "$runtime~", $runtime 3532 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2930 and return; 3533 and return;
2931 3534
2932 warn "runtime file written.\n"; 3535 warn "runtime file written.\n";
2933 3536
2934 1 3537 1
3538}
3539
3540our $uuid_lock;
3541our $uuid_skip;
3542
3543sub write_uuid_sync($) {
3544 $uuid_skip ||= $_[0];
3545
3546 return if $uuid_lock;
3547 local $uuid_lock = 1;
3548
3549 my $uuid = "$LOCALDIR/uuid";
3550
3551 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3552 or return;
3553
3554 my $value = uuid_seq uuid_cur;
3555
3556 unless ($value) {
3557 warn "cowardly refusing to write zero uuid value!\n";
3558 return;
3559 }
3560
3561 my $value = uuid_str $value + $uuid_skip;
3562 $uuid_skip = 0;
3563
3564 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3565 and return;
3566
3567 # always fsync - this file is important
3568 aio_fsync $fh
3569 and return;
3570
3571 close $fh
3572 or return;
3573
3574 aio_rename "$uuid~", $uuid
3575 and return;
3576
3577 warn "uuid file written ($value).\n";
3578
3579 1
3580
3581}
3582
3583sub write_uuid($$) {
3584 my ($skip, $sync) = @_;
3585
3586 $sync ? write_uuid_sync $skip
3587 : async { write_uuid_sync $skip };
2935} 3588}
2936 3589
2937sub emergency_save() { 3590sub emergency_save() {
2938 my $freeze_guard = cf::freeze_mainloop; 3591 my $freeze_guard = cf::freeze_mainloop;
2939 3592
2940 warn "enter emergency perl save\n"; 3593 warn "emergency_perl_save: enter\n";
2941 3594
2942 cf::sync_job { 3595 cf::sync_job {
3596 # this is a trade-off: we want to be very quick here, so
3597 # save all maps without fsync, and later call a global sync
3598 # (which in turn might be very very slow)
3599 local $USE_FSYNC = 0;
3600
2943 # use a peculiar iteration method to avoid tripping on perl 3601 # use a peculiar iteration method to avoid tripping on perl
2944 # refcount bugs in for. also avoids problems with players 3602 # refcount bugs in for. also avoids problems with players
2945 # and maps saved/destroyed asynchronously. 3603 # and maps saved/destroyed asynchronously.
2946 warn "begin emergency player save\n"; 3604 warn "emergency_perl_save: begin player save\n";
2947 for my $login (keys %cf::PLAYER) { 3605 for my $login (keys %cf::PLAYER) {
2948 my $pl = $cf::PLAYER{$login} or next; 3606 my $pl = $cf::PLAYER{$login} or next;
2949 $pl->valid or next; 3607 $pl->valid or next;
3608 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2950 $pl->save; 3609 $pl->save;
2951 } 3610 }
2952 warn "end emergency player save\n"; 3611 warn "emergency_perl_save: end player save\n";
2953 3612
2954 warn "begin emergency map save\n"; 3613 warn "emergency_perl_save: begin map save\n";
2955 for my $path (keys %cf::MAP) { 3614 for my $path (keys %cf::MAP) {
2956 my $map = $cf::MAP{$path} or next; 3615 my $map = $cf::MAP{$path} or next;
2957 $map->valid or next; 3616 $map->valid or next;
2958 $map->save; 3617 $map->save;
2959 } 3618 }
2960 warn "end emergency map save\n"; 3619 warn "emergency_perl_save: end map save\n";
2961 3620
2962 warn "begin emergency database checkpoint\n"; 3621 warn "emergency_perl_save: begin database checkpoint\n";
2963 BDB::db_env_txn_checkpoint $DB_ENV; 3622 BDB::db_env_txn_checkpoint $DB_ENV;
2964 warn "end emergency database checkpoint\n"; 3623 warn "emergency_perl_save: end database checkpoint\n";
3624
3625 warn "emergency_perl_save: begin write uuid\n";
3626 write_uuid_sync 1;
3627 warn "emergency_perl_save: end write uuid\n";
2965 }; 3628 };
2966 3629
3630 warn "emergency_perl_save: starting sync()\n";
3631 IO::AIO::aio_sync sub {
3632 warn "emergency_perl_save: finished sync()\n";
3633 };
3634
2967 warn "leave emergency perl save\n"; 3635 warn "emergency_perl_save: leave\n";
2968} 3636}
2969 3637
2970sub post_cleanup { 3638sub post_cleanup {
2971 my ($make_core) = @_; 3639 my ($make_core) = @_;
2972 3640
2973 warn Carp::longmess "post_cleanup backtrace" 3641 warn Carp::longmess "post_cleanup backtrace"
2974 if $make_core; 3642 if $make_core;
3643
3644 my $fh = pidfile;
3645 unlink $PIDFILE if <$fh> == $$;
3646}
3647
3648# a safer delete_package, copied from Symbol
3649sub clear_package($) {
3650 my $pkg = shift;
3651
3652 # expand to full symbol table name if needed
3653 unless ($pkg =~ /^main::.*::$/) {
3654 $pkg = "main$pkg" if $pkg =~ /^::/;
3655 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3656 $pkg .= '::' unless $pkg =~ /::$/;
3657 }
3658
3659 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3660 my $stem_symtab = *{$stem}{HASH};
3661
3662 defined $stem_symtab and exists $stem_symtab->{$leaf}
3663 or return;
3664
3665 # clear all symbols
3666 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3667 for my $name (keys %$leaf_symtab) {
3668 _gv_clear *{"$pkg$name"};
3669# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3670 }
3671 warn "cleared package $pkg\n";#d#
2975} 3672}
2976 3673
2977sub do_reload_perl() { 3674sub do_reload_perl() {
2978 # can/must only be called in main 3675 # can/must only be called in main
2979 if ($Coro::current != $Coro::main) { 3676 if ($Coro::current != $Coro::main) {
2980 warn "can only reload from main coroutine"; 3677 warn "can only reload from main coroutine";
2981 return; 3678 return;
2982 } 3679 }
2983 3680
3681 return if $RELOAD++;
3682
3683 my $t1 = EV::time;
3684
3685 while ($RELOAD) {
2984 warn "reloading..."; 3686 warn "reloading...";
2985 3687
2986 warn "entering sync_job"; 3688 warn "entering sync_job";
2987 3689
2988 cf::sync_job { 3690 cf::sync_job {
2989 cf::write_runtime; # external watchdog should not bark 3691 cf::write_runtime_sync; # external watchdog should not bark
2990 cf::emergency_save; 3692 cf::emergency_save;
2991 cf::write_runtime; # external watchdog should not bark 3693 cf::write_runtime_sync; # external watchdog should not bark
2992 3694
2993 warn "syncing database to disk"; 3695 warn "syncing database to disk";
2994 BDB::db_env_txn_checkpoint $DB_ENV; 3696 BDB::db_env_txn_checkpoint $DB_ENV;
2995 3697
2996 # if anything goes wrong in here, we should simply crash as we already saved 3698 # if anything goes wrong in here, we should simply crash as we already saved
2997 3699
2998 warn "cancelling all WF_AUTOCANCEL watchers";
2999 for (Event::all_watchers) {
3000 $_->cancel if $_->data & WF_AUTOCANCEL;
3001 }
3002
3003 warn "flushing outstanding aio requests"; 3700 warn "flushing outstanding aio requests";
3004 for (;;) {
3005 BDB::flush;
3006 IO::AIO::flush;
3007 Coro::cede;
3008 last unless IO::AIO::nreqs || BDB::nreqs; 3701 while (IO::AIO::nreqs || BDB::nreqs) {
3009 warn "iterate..."; 3702 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3010 }
3011
3012 ++$RELOAD;
3013
3014 warn "cancelling all extension coros";
3015 $_->cancel for values %EXT_CORO;
3016 %EXT_CORO = ();
3017
3018 warn "removing commands";
3019 %COMMAND = ();
3020
3021 warn "removing ext/exti commands";
3022 %EXTCMD = ();
3023 %EXTICMD = ();
3024
3025 warn "unloading/nuking all extensions";
3026 for my $pkg (@EXTS) {
3027 warn "... unloading $pkg";
3028
3029 if (my $cb = $pkg->can ("unload")) {
3030 eval {
3031 $cb->($pkg);
3032 1
3033 } or warn "$pkg unloaded, but with errors: $@";
3034 } 3703 }
3035 3704
3036 warn "... nuking $pkg"; 3705 warn "cancelling all extension coros";
3037 Symbol::delete_package $pkg; 3706 $_->cancel for values %EXT_CORO;
3038 } 3707 %EXT_CORO = ();
3039 3708
3040 warn "unloading all perl modules loaded from $LIBDIR"; 3709 warn "removing commands";
3041 while (my ($k, $v) = each %INC) { 3710 %COMMAND = ();
3042 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3043 3711
3712 warn "removing ext/exti commands";
3713 %EXTCMD = ();
3714 %EXTICMD = ();
3715
3716 warn "unloading/nuking all extensions";
3717 for my $pkg (@EXTS) {
3044 warn "... unloading $k"; 3718 warn "... unloading $pkg";
3045 delete $INC{$k};
3046 3719
3047 $k =~ s/\.pm$//;
3048 $k =~ s/\//::/g;
3049
3050 if (my $cb = $k->can ("unload_module")) { 3720 if (my $cb = $pkg->can ("unload")) {
3721 eval {
3051 $cb->(); 3722 $cb->($pkg);
3723 1
3724 } or warn "$pkg unloaded, but with errors: $@";
3725 }
3726
3727 warn "... clearing $pkg";
3728 clear_package $pkg;
3052 } 3729 }
3053 3730
3054 Symbol::delete_package $k; 3731 warn "unloading all perl modules loaded from $LIBDIR";
3732 while (my ($k, $v) = each %INC) {
3733 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3734
3735 warn "... unloading $k";
3736 delete $INC{$k};
3737
3738 $k =~ s/\.pm$//;
3739 $k =~ s/\//::/g;
3740
3741 if (my $cb = $k->can ("unload_module")) {
3742 $cb->();
3743 }
3744
3745 clear_package $k;
3055 } 3746 }
3056 3747
3057 warn "getting rid of safe::, as good as possible"; 3748 warn "getting rid of safe::, as good as possible";
3058 Symbol::delete_package "safe::$_" 3749 clear_package "safe::$_"
3059 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3750 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3060 3751
3061 warn "unloading cf.pm \"a bit\""; 3752 warn "unloading cf.pm \"a bit\"";
3062 delete $INC{"cf.pm"}; 3753 delete $INC{"cf.pm"};
3063 delete $INC{"cf/pod.pm"}; 3754 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3064 3755
3065 # don't, removes xs symbols, too, 3756 # don't, removes xs symbols, too,
3066 # and global variables created in xs 3757 # and global variables created in xs
3067 #Symbol::delete_package __PACKAGE__; 3758 #clear_package __PACKAGE__;
3068 3759
3069 warn "unload completed, starting to reload now"; 3760 warn "unload completed, starting to reload now";
3070 3761
3071 warn "reloading cf.pm"; 3762 warn "reloading cf.pm";
3072 require cf; 3763 require cf;
3073 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3764 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3074 3765
3075 warn "loading config and database again"; 3766 warn "loading config and database again";
3076 cf::cfg_load; 3767 cf::reload_config;
3077 3768
3078 warn "loading extensions"; 3769 warn "loading extensions";
3079 cf::load_extensions; 3770 cf::load_extensions;
3080 3771
3772 if ($REATTACH_ON_RELOAD) {
3081 warn "reattaching attachments to objects/players"; 3773 warn "reattaching attachments to objects/players";
3082 _global_reattach; # objects, sockets 3774 _global_reattach; # objects, sockets
3083 warn "reattaching attachments to maps"; 3775 warn "reattaching attachments to maps";
3084 reattach $_ for values %MAP; 3776 reattach $_ for values %MAP;
3085 warn "reattaching attachments to players"; 3777 warn "reattaching attachments to players";
3086 reattach $_ for values %PLAYER; 3778 reattach $_ for values %PLAYER;
3779 }
3087 3780
3781 warn "running post_init jobs";
3782 (pop @POST_INIT)->(1) while @POST_INIT;
3783
3088 warn "leaving sync_job"; 3784 warn "leaving sync_job";
3089 3785
3090 1 3786 1
3091 } or do { 3787 } or do {
3092 warn $@; 3788 warn $@;
3093 warn "error while reloading, exiting."; 3789 cf::cleanup "error while reloading, exiting.";
3094 exit 1;
3095 }; 3790 };
3096 3791
3097 warn "reloaded"; 3792 warn "reloaded";
3793 --$RELOAD;
3794 }
3795
3796 $t1 = EV::time - $t1;
3797 warn "reload completed in ${t1}s\n";
3098}; 3798};
3099 3799
3100our $RELOAD_WATCHER; # used only during reload 3800our $RELOAD_WATCHER; # used only during reload
3101 3801
3102sub reload_perl() { 3802sub reload_perl() {
3103 # doing reload synchronously and two reloads happen back-to-back, 3803 # doing reload synchronously and two reloads happen back-to-back,
3104 # coro crashes during coro_state_free->destroy here. 3804 # coro crashes during coro_state_free->destroy here.
3105 3805
3106 $RELOAD_WATCHER ||= Event->timer ( 3806 $RELOAD_WATCHER ||= cf::async {
3107 reentrant => 0, 3807 Coro::AIO::aio_wait cache_extensions;
3108 after => 0, 3808
3109 data => WF_AUTOCANCEL, 3809 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3110 cb => sub {
3111 do_reload_perl; 3810 do_reload_perl;
3112 undef $RELOAD_WATCHER; 3811 undef $RELOAD_WATCHER;
3113 }, 3812 };
3114 ); 3813 };
3115} 3814}
3116 3815
3117register_command "reload" => sub { 3816register_command "reload" => sub {
3118 my ($who, $arg) = @_; 3817 my ($who, $arg) = @_;
3119 3818
3120 if ($who->flag (FLAG_WIZ)) { 3819 if ($who->flag (FLAG_WIZ)) {
3121 $who->message ("reloading server."); 3820 $who->message ("reloading server.");
3821 async {
3822 $Coro::current->{desc} = "perl_reload";
3122 async { reload_perl }; 3823 reload_perl;
3824 };
3123 } 3825 }
3124}; 3826};
3125 3827
3126unshift @INC, $LIBDIR; 3828unshift @INC, $LIBDIR;
3127 3829
… …
3129 3831
3130our @WAIT_FOR_TICK; 3832our @WAIT_FOR_TICK;
3131our @WAIT_FOR_TICK_BEGIN; 3833our @WAIT_FOR_TICK_BEGIN;
3132 3834
3133sub wait_for_tick { 3835sub wait_for_tick {
3134 return unless $TICK_WATCHER->is_active;
3135 return if $Coro::current == $Coro::main; 3836 return if tick_inhibit || $Coro::current == $Coro::main;
3136 3837
3137 my $signal = new Coro::Signal; 3838 my $signal = new Coro::Signal;
3138 push @WAIT_FOR_TICK, $signal; 3839 push @WAIT_FOR_TICK, $signal;
3139 $signal->wait; 3840 $signal->wait;
3140} 3841}
3141 3842
3142sub wait_for_tick_begin { 3843sub wait_for_tick_begin {
3143 return unless $TICK_WATCHER->is_active;
3144 return if $Coro::current == $Coro::main; 3844 return if tick_inhibit || $Coro::current == $Coro::main;
3145 3845
3146 my $signal = new Coro::Signal; 3846 my $signal = new Coro::Signal;
3147 push @WAIT_FOR_TICK_BEGIN, $signal; 3847 push @WAIT_FOR_TICK_BEGIN, $signal;
3148 $signal->wait; 3848 $signal->wait;
3149} 3849}
3150 3850
3151 my $min = 1e6;#d# 3851sub tick {
3152 my $avg = 10;
3153$TICK_WATCHER = Event->timer (
3154 reentrant => 0,
3155 parked => 1,
3156 prio => 0,
3157 at => $NEXT_TICK || $TICK,
3158 data => WF_AUTOCANCEL,
3159 cb => sub {
3160 if ($Coro::current != $Coro::main) { 3852 if ($Coro::current != $Coro::main) {
3161 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3853 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3162 unless ++$bug_warning > 10; 3854 unless ++$bug_warning > 10;
3163 return; 3855 return;
3164 } 3856 }
3165 3857
3166 $NOW = $tick_start = Event::time;
3167
3168 cf::server_tick; # one server iteration 3858 cf::server_tick; # one server iteration
3169 3859
3170 0 && sync_job {#d# 3860 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3171 for(1..10) { 3861 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3172 my $t = Event::time; 3862 Coro::async_pool {
3173 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3863 $Coro::current->{desc} = "runtime saver";
3174 or die; 3864 write_runtime_sync
3175 3865 or warn "ERROR: unable to write runtime file: $!";
3176 $map->width (50);
3177 $map->height (50);
3178 $map->alloc;
3179 $map->_load_objects ("/tmp/x.map", 1);
3180 my $t = Event::time - $t;
3181
3182 #next unless $t < 0.0013;#d#
3183 if ($t < $min) {
3184 $min = $t;
3185 }
3186 $avg = $avg * 0.99 + $t * 0.01;
3187 }
3188 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3189 exit 0;
3190 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3191 }; 3866 };
3867 }
3192 3868
3193 $RUNTIME += $TICK;
3194 $NEXT_TICK += $TICK;
3195
3196 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3197 $NEXT_RUNTIME_WRITE = $NOW + 10;
3198 Coro::async_pool {
3199 write_runtime
3200 or warn "ERROR: unable to write runtime file: $!";
3201 };
3202 }
3203
3204# my $AFTER = Event::time;
3205# warn $AFTER - $NOW;#d#
3206
3207 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3869 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3208 $sig->send; 3870 $sig->send;
3209 } 3871 }
3210 while (my $sig = shift @WAIT_FOR_TICK) { 3872 while (my $sig = shift @WAIT_FOR_TICK) {
3211 $sig->send; 3873 $sig->send;
3212 } 3874 }
3213 3875
3214 $NOW = Event::time; 3876 $LOAD = ($NOW - $TICK_START) / $TICK;
3215
3216 # if we are delayed by four ticks or more, skip them all
3217 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3218
3219 $TICK_WATCHER->at ($NEXT_TICK);
3220 $TICK_WATCHER->start;
3221
3222 $LOAD = ($NOW - $tick_start) / $TICK;
3223 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3877 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3224 3878
3225 _post_tick; 3879 if (0) {
3226 3880 if ($NEXT_TICK) {
3227 3881 my $jitter = $TICK_START - $NEXT_TICK;
3882 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3883 warn "jitter $JITTER\n";#d#
3884 }
3228 }, 3885 }
3229); 3886}
3230 3887
3231{ 3888{
3232 BDB::max_poll_time $TICK * 0.1; 3889 # configure BDB
3233 $BDB_POLL_WATCHER = Event->io ( 3890
3234 reentrant => 0,
3235 fd => BDB::poll_fileno,
3236 poll => 'r',
3237 prio => 0,
3238 data => WF_AUTOCANCEL,
3239 cb => \&BDB::poll_cb,
3240 );
3241 BDB::min_parallel 8; 3891 BDB::min_parallel 8;
3242 3892 BDB::max_poll_reqs $TICK * 0.1;
3243 BDB::set_sync_prepare { 3893 $AnyEvent::BDB::WATCHER->priority (1);
3244 my $status;
3245 my $current = $Coro::current;
3246 (
3247 sub {
3248 $status = $!;
3249 $current->ready; undef $current;
3250 },
3251 sub {
3252 Coro::schedule while defined $current;
3253 $! = $status;
3254 },
3255 )
3256 };
3257 3894
3258 unless ($DB_ENV) { 3895 unless ($DB_ENV) {
3259 $DB_ENV = BDB::db_env_create; 3896 $DB_ENV = BDB::db_env_create;
3897 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3898 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3899 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3900 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3901 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3260 3902
3261 cf::sync_job { 3903 cf::sync_job {
3262 eval { 3904 eval {
3263 BDB::db_env_open 3905 BDB::db_env_open
3264 $DB_ENV, 3906 $DB_ENV,
… …
3266 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3908 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3267 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3909 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3268 0666; 3910 0666;
3269 3911
3270 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3912 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3271
3272 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3273 $DB_ENV->set_lk_detect;
3274 }; 3913 };
3275 3914
3276 cf::cleanup "db_env_open(db): $@" if $@; 3915 cf::cleanup "db_env_open(db): $@" if $@;
3277 }; 3916 };
3278 } 3917 }
3918
3919 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3920 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3921 };
3922 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3923 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3924 };
3925 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3926 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3927 };
3279} 3928}
3280 3929
3281{ 3930{
3931 # configure IO::AIO
3932
3282 IO::AIO::min_parallel 8; 3933 IO::AIO::min_parallel 8;
3283
3284 undef $Coro::AIO::WATCHER;
3285 IO::AIO::max_poll_time $TICK * 0.1; 3934 IO::AIO::max_poll_time $TICK * 0.1;
3286 $AIO_POLL_WATCHER = Event->io ( 3935 undef $AnyEvent::AIO::WATCHER;
3287 reentrant => 0,
3288 data => WF_AUTOCANCEL,
3289 fd => IO::AIO::poll_fileno,
3290 poll => 'r',
3291 prio => 6,
3292 cb => \&IO::AIO::poll_cb,
3293 );
3294} 3936}
3295 3937
3296my $_log_backtrace; 3938my $_log_backtrace;
3297 3939
3298sub _log_backtrace { 3940sub _log_backtrace {
… …
3301 $msg =~ s/\n//; 3943 $msg =~ s/\n//;
3302 3944
3303 # limit the # of concurrent backtraces 3945 # limit the # of concurrent backtraces
3304 if ($_log_backtrace < 2) { 3946 if ($_log_backtrace < 2) {
3305 ++$_log_backtrace; 3947 ++$_log_backtrace;
3948 my $perl_bt = Carp::longmess $msg;
3306 async { 3949 async {
3950 $Coro::current->{desc} = "abt $msg";
3951
3307 my @bt = fork_call { 3952 my @bt = fork_call {
3308 @addr = map { sprintf "%x", $_ } @addr; 3953 @addr = map { sprintf "%x", $_ } @addr;
3309 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3954 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3310 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3955 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3311 or die "addr2line: $!"; 3956 or die "addr2line: $!";
… …
3319 } 3964 }
3320 3965
3321 @funcs 3966 @funcs
3322 }; 3967 };
3323 3968
3324 LOG llevInfo, "[ABT] $msg\n"; 3969 LOG llevInfo, "[ABT] $perl_bt\n";
3970 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3325 LOG llevInfo, "[ABT] $_\n" for @bt; 3971 LOG llevInfo, "[ABT] $_\n" for @bt;
3326 --$_log_backtrace; 3972 --$_log_backtrace;
3327 }; 3973 };
3328 } else { 3974 } else {
3329 LOG llevInfo, "[ABT] $msg\n"; 3975 LOG llevInfo, "[ABT] $msg\n";
3330 LOG llevInfo, "[ABT] [suppressed]\n"; 3976 LOG llevInfo, "[ABT] [suppressed]\n";
3331 } 3977 }
3332} 3978}
3333 3979
3334# load additional modules 3980# load additional modules
3335use cf::pod; 3981require "cf/$_.pm" for @EXTRA_MODULES;
3336 3982
3337END { cf::emergency_save } 3983END { cf::emergency_save }
3338 3984
33391 39851
3340 3986

Diff Legend

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