ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cf.schmorp.de/server/lib/cf.pm
(Generate patch)

Comparing cf.schmorp.de/server/lib/cf.pm (file contents):
Revision 1.136 by root, Fri Jan 5 01:06:28 2007 UTC vs.
Revision 1.146 by root, Sun Jan 7 23:10:43 2007 UTC

… …
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
19 19
20use Digest::MD5; 20use Digest::MD5;
21use Fcntl; 21use Fcntl;
22use IO::AIO 2.31 (); 22use IO::AIO 2.32 ();
23use YAML::Syck (); 23use YAML::Syck ();
24use Time::HiRes; 24use Time::HiRes;
25 25
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 26use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 27
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 29$YAML::Syck::ImplicitUnicode = 1;
30 30
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 31$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32 32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 34
35our %COMMAND = (); 35our %COMMAND = ();
36our %COMMAND_TIME = (); 36our %COMMAND_TIME = ();
… …
47our %CFG; 47our %CFG;
48 48
49our $UPTIME; $UPTIME ||= time; 49our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 50our $RUNTIME;
51 51
52our %PLAYER; # all users
52our %MAP; # all maps 53our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 54our $LINK_MAP; # the special {link} map
54our $RANDOM_MAPS = cf::localdir . "/random"; 55our $RANDOM_MAPS = cf::localdir . "/random";
55our %EXT_CORO; 56our %EXT_CORO; # coroutines bound to extensions
56 57
57binmode STDOUT; 58binmode STDOUT;
58binmode STDERR; 59binmode STDERR;
59 60
60# read virtual server time, if available 61# read virtual server time, if available
… …
117 utf8::encode $msg; 118 utf8::encode $msg;
118 119
119 $msg .= "\n" 120 $msg .= "\n"
120 unless $msg =~ /\n$/; 121 unless $msg =~ /\n$/;
121 122
122 LOG llevError, "cfperl: $msg"; 123 LOG llevError, $msg;
123 }; 124 };
124} 125}
125 126
126@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 127@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
127@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 128@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
… …
221 # wake up all waiters, to be on the safe side 222 # wake up all waiters, to be on the safe side
222 $_->ready for @{ delete $LOCK{$key} }; 223 $_->ready for @{ delete $LOCK{$key} };
223 } 224 }
224} 225}
225 226
226=item cf::async { BLOCK }
227
228Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the
229error instead of exiting the server in case of a problem.
230
231=cut
232
233sub async(&) {
234 my ($cb) = @_;
235
236 Coro::async {
237 eval { $cb->() };
238 warn $@ if $@;
239 }
240}
241
242sub freeze_mainloop { 227sub freeze_mainloop {
243 return unless $TICK_WATCHER->is_active; 228 return unless $TICK_WATCHER->is_active;
244 229
245 my $guard = Coro::guard { $TICK_WATCHER->start }; 230 my $guard = Coro::guard { $TICK_WATCHER->start };
246 $TICK_WATCHER->stop; 231 $TICK_WATCHER->stop;
247 $guard 232 $guard
248} 233}
234
235=item cf::async { BLOCK }
236
237Currently the same as Coro::async_pool, meaning you cannot use
238C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
239thing you are allowed to do is call C<prio> on it.
240
241=cut
242
243BEGIN { *async = \&Coro::async_pool }
249 244
250=item cf::sync_job { BLOCK } 245=item cf::sync_job { BLOCK }
251 246
252The design of crossfire+ requires that the main coro ($Coro::main) is 247The design of crossfire+ requires that the main coro ($Coro::main) is
253always able to handle events or runnable, as crossfire+ is only partly 248always able to handle events or runnable, as crossfire+ is only partly
… …
272 my $freeze_guard = freeze_mainloop; 267 my $freeze_guard = freeze_mainloop;
273 268
274 my $busy = 1; 269 my $busy = 1;
275 my @res; 270 my @res;
276 271
277 (Coro::async { 272 (async {
278 @res = eval { $job->() }; 273 @res = eval { $job->() };
279 warn $@ if $@; 274 warn $@ if $@;
280 undef $busy; 275 undef $busy;
281 })->prio (Coro::PRIO_MAX); 276 })->prio (Coro::PRIO_MAX);
282 277
283 while ($busy) { 278 while ($busy) {
284 Coro::cede_notself; 279 Coro::cede or Event::one_event;
285 Event::one_event unless Coro::nready;
286 } 280 }
287 281
288 wantarray ? @res : $res[0] 282 wantarray ? @res : $res[0]
289 } else { 283 } else {
290 # we are in another coroutine, how wonderful, everything just works 284 # we are in another coroutine, how wonderful, everything just works
291 285
292 $job->() 286 $job->()
293 } 287 }
294} 288}
295 289
296=item $coro = cf::coro { BLOCK } 290=item $coro = cf::async_ext { BLOCK }
297 291
298Creates and returns a new coro. This coro is automcatially being canceled 292Like async, but this coro is automcatially being canceled when the
299when the extension calling this is being unloaded. 293extension calling this is being unloaded.
300 294
301=cut 295=cut
302 296
303sub coro(&) { 297sub async_ext(&) {
304 my $cb = shift; 298 my $cb = shift;
305 299
306 my $coro = &cf::async ($cb); 300 my $coro = &Coro::async ($cb);
307 301
308 $coro->on_destroy (sub { 302 $coro->on_destroy (sub {
309 delete $EXT_CORO{$coro+0}; 303 delete $EXT_CORO{$coro+0};
310 }); 304 });
311 $EXT_CORO{$coro+0} = $coro; 305 $EXT_CORO{$coro+0} = $coro;
… …
1078 1072
1079=head2 CORE EXTENSIONS 1073=head2 CORE EXTENSIONS
1080 1074
1081Functions and methods that extend core crossfire objects. 1075Functions and methods that extend core crossfire objects.
1082 1076
1077=cut
1078
1079package cf::player;
1080
1083=head3 cf::player 1081=head3 cf::player
1084 1082
1085=over 4 1083=over 4
1086 1084
1087=item cf::player::exists $login 1085=item cf::player::find $login
1088 1086
1089Returns true when the given account exists. 1087Returns the given player object, loading it if necessary (might block).
1090 1088
1091=cut 1089=cut
1092 1090
1093sub cf::player::exists($) { 1091sub playerdir($) {
1094 cf::player::find $_[0] 1092 cf::localdir
1095 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1093 . "/"
1094 . cf::playerdir
1095 . "/"
1096 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1097}
1098
1099sub path($) {
1100 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1101
1102 (playerdir $login) . "/$login.pl"
1103}
1104
1105sub find_active($) {
1106 $cf::PLAYER{$_[0]}
1107 and $cf::PLAYER{$_[0]}->active
1108 and $cf::PLAYER{$_[0]}
1109}
1110
1111sub exists($) {
1112 my ($login) = @_;
1113
1114 $cf::PLAYER{$login}
1115 or cf::sync_job { !aio_stat $login }
1116}
1117
1118sub find($) {
1119 return $cf::PLAYER{$_[0]} || do {
1120 my $login = $_[0];
1121
1122 my $guard = cf::lock_acquire "user_find:$login";
1123
1124 $cf::PLAYER{$login} ||= (load_pl path $login or return);
1125 };
1126}
1127
1128sub save($) {
1129 my ($pl) = @_;
1130
1131 return if $pl->{deny_save};
1132
1133 my $path = path $pl;
1134 my $guard = cf::lock_acquire "user_save:$path";
1135
1136 return if $pl->{deny_save};
1137
1138 IO::AIO::aio_mkdir playerdir $pl, 0770;
1139 $pl->{last_save} = $cf::RUNTIME;
1140
1141 Coro::cede;
1142 $pl->save_pl ($path);
1143 Coro::cede;
1144}
1145
1146sub new($) {
1147 my ($login) = @_;
1148
1149 my $self = create;
1150
1151 $self->ob->name ($login);
1152 $self->{deny_save} = 1;
1153
1154 $cf::PLAYER{$login} = $self;
1155
1156 $self
1157}
1158
1159sub quit_character {
1160 my ($pl) = @_;
1161
1162 $pl->{deny_save} = 1;
1163 $pl->password ("*"); # this should lock out the player until we nuked the dir
1164
1165 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1166 $pl->deactivate;
1167 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1168 $pl->ns->destroy if $pl->ns;
1169
1170 my $path = playerdir $pl;
1171 my $temp = "$path~$cf::RUNTIME~deleting~";
1172 IO::AIO::aio_rename $path, $temp, sub {
1173 delete $cf::PLAYER{$pl->ob->name};
1174 $pl->destroy;
1175
1176 IO::AIO::aio_rmtree $temp;
1177 };
1096} 1178}
1097 1179
1098=item $player->ext_reply ($msgid, $msgtype, %msg) 1180=item $player->ext_reply ($msgid, $msgtype, %msg)
1099 1181
1100Sends an ext reply to the player. 1182Sends an ext reply to the player.
1101 1183
1102=cut 1184=cut
1103 1185
1104sub cf::player::ext_reply($$$%) { 1186sub ext_reply($$$%) {
1105 my ($self, $id, %msg) = @_; 1187 my ($self, $id, %msg) = @_;
1106 1188
1107 $msg{msgid} = $id; 1189 $msg{msgid} = $id;
1108 1190
1109 $self->send ("ext " . to_json \%msg); 1191 $self->send ("ext " . cf::to_json \%msg);
1110} 1192}
1193
1194package cf;
1111 1195
1112=back 1196=back
1113 1197
1114 1198
1115=head3 cf::map 1199=head3 cf::map
… …
1296} 1380}
1297 1381
1298sub save { 1382sub save {
1299 my ($self) = @_; 1383 my ($self) = @_;
1300 1384
1385 my $lock = cf::lock_acquire "map_data:" . $self->path;
1386
1301 $self->{last_save} = $cf::RUNTIME; 1387 $self->{last_save} = $cf::RUNTIME;
1302 1388
1303 return unless $self->dirty; 1389 return unless $self->dirty;
1304 1390
1305 my $save = $self->{path}->save_path; utf8::encode $save; 1391 my $save = $self->{path}->save_path; utf8::encode $save;
… …
1308 $self->{load_path} = $save; 1394 $self->{load_path} = $save;
1309 1395
1310 return if $self->{deny_save}; 1396 return if $self->{deny_save};
1311 1397
1312 local $self->{last_access} = $self->last_access;#d# 1398 local $self->{last_access} = $self->last_access;#d#
1399
1400 cf::async {
1401 $_->contr->save for $self->players;
1402 };
1313 1403
1314 if ($uniq) { 1404 if ($uniq) {
1315 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1405 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1316 $self->save_objects ($uniq, cf::IO_UNIQUES); 1406 $self->save_objects ($uniq, cf::IO_UNIQUES);
1317 } else { 1407 } else {
… …
1323 my ($self) = @_; 1413 my ($self) = @_;
1324 1414
1325 # save first because save cedes 1415 # save first because save cedes
1326 $self->save; 1416 $self->save;
1327 1417
1418 my $lock = cf::lock_acquire "map_data:" . $self->path;
1419
1328 return if $self->players; 1420 return if $self->players;
1329 return if $self->in_memory != cf::MAP_IN_MEMORY; 1421 return if $self->in_memory != cf::MAP_IN_MEMORY;
1330 return if $self->{deny_save}; 1422 return if $self->{deny_save};
1331 1423
1332 $self->clear; 1424 $self->clear;
… …
1374} 1466}
1375 1467
1376sub reset { 1468sub reset {
1377 my ($self) = @_; 1469 my ($self) = @_;
1378 1470
1471 my $lock = cf::lock_acquire "map_data:" . $self->path;
1472
1379 return if $self->players; 1473 return if $self->players;
1380 return if $self->{path}{user_rel};#d# 1474 return if $self->{path}{user_rel};#d#
1381 1475
1382 warn "resetting map ", $self->path;#d# 1476 warn "resetting map ", $self->path;#d#
1383 1477
… …
1411} 1505}
1412 1506
1413sub emergency_save { 1507sub emergency_save {
1414 my $freeze_guard = cf::freeze_mainloop; 1508 my $freeze_guard = cf::freeze_mainloop;
1415 1509
1416 warn "enter emergency map save\n"; 1510 warn "enter emergency perl save\n";
1417 1511
1418 cf::sync_job { 1512 cf::sync_job {
1513 warn "begin emergency player save\n";
1514 $_->save for values %cf::PLAYER;
1515 warn "end emergency player save\n";
1516
1419 warn "begin emergency map save\n"; 1517 warn "begin emergency map save\n";
1420 $_->save for values %cf::MAP; 1518 $_->save for values %cf::MAP;
1519 warn "end emergency map save\n";
1421 }; 1520 };
1422 1521
1423 warn "end emergency map save\n"; 1522 warn "leave emergency perl save\n";
1424} 1523}
1425 1524
1426package cf; 1525package cf;
1427 1526
1428=back 1527=back
… …
1527 ($x, $y) = ($map->enter_x, $map->enter_y) 1626 ($x, $y) = ($map->enter_x, $map->enter_y)
1528 if $x <=0 && $y <= 0; 1627 if $x <=0 && $y <= 0;
1529 1628
1530 $map->load; 1629 $map->load;
1531 1630
1631 return unless $self->contr->active;
1532 $self->activate_recursive; 1632 $self->activate_recursive;
1533 $self->enter_map ($map, $x, $y); 1633 $self->enter_map ($map, $x, $y);
1534} 1634}
1535 1635
1536cf::player->attach ( 1636cf::player->attach (
… …
1549 1649
1550 # try to abort aborted map switching on player login :) 1650 # try to abort aborted map switching on player login :)
1551 # should happen only on crashes 1651 # should happen only on crashes
1552 if ($pl->ob->{_link_pos}) { 1652 if ($pl->ob->{_link_pos}) {
1553 $pl->ob->enter_link; 1653 $pl->ob->enter_link;
1554 cf::async { 1654 (async {
1555 # we need this sleep as the login has a concurrent enter_exit running 1655 # we need this sleep as the login has a concurrent enter_exit running
1556 # and this sleep increases chances of the player not ending up in scorn 1656 # and this sleep increases chances of the player not ending up in scorn
1657 $pl->ob->reply (undef,
1658 "There was an internal problem at your last logout, "
1659 . "the server will try to bring you to your intended destination in a second.",
1660 cf::NDI_RED);
1557 Coro::Timer::sleep 1; 1661 Coro::Timer::sleep 1;
1558 $pl->ob->leave_link; 1662 $pl->ob->leave_link;
1559 }; 1663 })->prio (2);
1560 } 1664 }
1561 }, 1665 },
1562); 1666);
1563 1667
1564=item $player_object->goto ($path, $x, $y) 1668=item $player_object->goto ($path, $x, $y)
… …
1568sub cf::object::player::goto { 1672sub cf::object::player::goto {
1569 my ($self, $path, $x, $y) = @_; 1673 my ($self, $path, $x, $y) = @_;
1570 1674
1571 $self->enter_link; 1675 $self->enter_link;
1572 1676
1573 (cf::async { 1677 (async {
1574 $path = new cf::path $path; 1678 $path = new cf::path $path;
1575 1679
1576 my $map = cf::map::find $path->as_string; 1680 my $map = cf::map::find $path->as_string;
1577 $map = $map->customise_for ($self) if $map; 1681 $map = $map->customise_for ($self) if $map;
1578 1682
… …
1640 1744
1641 return unless $self->type == cf::PLAYER; 1745 return unless $self->type == cf::PLAYER;
1642 1746
1643 $self->enter_link; 1747 $self->enter_link;
1644 1748
1645 (cf::async { 1749 (async {
1646 $self->deactivate_recursive; # just to be sure 1750 $self->deactivate_recursive; # just to be sure
1647 unless (eval { 1751 unless (eval {
1648 prepare_random_map $exit 1752 prepare_random_map $exit
1649 if $exit->slaying eq "/!"; 1753 if $exit->slaying eq "/!";
1650 1754
… …
1731 } 1835 }
1732 } 1836 }
1733 }, 1837 },
1734); 1838);
1735 1839
1736=item $client->coro (\&cb) 1840=item $client->async (\&cb)
1737 1841
1738Create a new coroutine, running the specified callback. The coroutine will 1842Create a new coroutine, running the specified callback. The coroutine will
1739be automatically cancelled when the client gets destroyed (e.g. on logout, 1843be automatically cancelled when the client gets destroyed (e.g. on logout,
1740or loss of connection). 1844or loss of connection).
1741 1845
1742=cut 1846=cut
1743 1847
1744sub cf::client::coro { 1848sub cf::client::async {
1745 my ($self, $cb) = @_; 1849 my ($self, $cb) = @_;
1746 1850
1747 my $coro = &cf::async ($cb); 1851 my $coro = &Coro::async ($cb);
1748 1852
1749 $coro->on_destroy (sub { 1853 $coro->on_destroy (sub {
1750 delete $self->{_coro}{$coro+0}; 1854 delete $self->{_coro}{$coro+0};
1751 }); 1855 });
1752 1856
… …
1990 local $/; 2094 local $/;
1991 *CFG = YAML::Syck::Load <$fh>; 2095 *CFG = YAML::Syck::Load <$fh>;
1992 2096
1993 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 2097 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
1994 2098
2099 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2100 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2101
1995 if (exists $CFG{mlockall}) { 2102 if (exists $CFG{mlockall}) {
1996 eval { 2103 eval {
1997 $CFG{mlockall} ? &mlockall : &munlockall 2104 $CFG{mlockall} ? &mlockall : &munlockall
1998 and die "WARNING: m(un)lockall failed: $!\n"; 2105 and die "WARNING: m(un)lockall failed: $!\n";
1999 }; 2106 };
… …
2003 2110
2004sub main { 2111sub main {
2005 # we must not ever block the main coroutine 2112 # we must not ever block the main coroutine
2006 local $Coro::idle = sub { 2113 local $Coro::idle = sub {
2007 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2114 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2008 (Coro::unblock_sub {
2009 Event::one_event; 2115 async { Event::one_event };
2010 })->();
2011 }; 2116 };
2012 2117
2013 cfg_load; 2118 cfg_load;
2014 db_load; 2119 db_load;
2015 load_extensions; 2120 load_extensions;
… …
2098 cf::load_extensions; 2203 cf::load_extensions;
2099 2204
2100 # reattach attachments to objects 2205 # reattach attachments to objects
2101 warn "reattach"; 2206 warn "reattach";
2102 _global_reattach; 2207 _global_reattach;
2208 reattach $_ for values %MAP;
2103 }; 2209 };
2104 2210
2105 if ($@) { 2211 if ($@) {
2106 warn $@; 2212 warn $@;
2107 warn "error while reloading, exiting."; 2213 warn "error while reloading, exiting.";
… …
2123 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2229 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2124 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2230 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2125 2231
2126 # dirty hack because... archetypes are not yet loaded 2232 # dirty hack because... archetypes are not yet loaded
2127 Event->timer ( 2233 Event->timer (
2128 after => 2, 2234 after => 10,
2129 cb => sub { 2235 cb => sub {
2130 $_[0]->w->cancel; 2236 $_[0]->w->cancel;
2131 2237
2132 # provide some exits "home" 2238 # provide some exits "home"
2133 my $exit = cf::object::new "exit"; 2239 my $exit = cf::object::new "exit";

Diff Legend

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