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.119 by root, Tue Jan 2 08:26:42 2007 UTC vs.
Revision 1.142 by root, Fri Jan 5 21:51:42 2007 UTC

… …
8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3; 13use Coro 3.3 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
… …
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 = ();
… …
49our $UPTIME; $UPTIME ||= time; 49our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 50our $RUNTIME;
51 51
52our %MAP; # all maps 52our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 53our $LINK_MAP; # the special {link} map
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 54our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 55our %EXT_CORO;
57 56
58binmode STDOUT; 57binmode STDOUT;
59binmode STDERR; 58binmode STDERR;
… …
71mkdir cf::localdir . "/" . cf::uniquedir; 70mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 71mkdir $RANDOM_MAPS;
73 72
74# a special map that is always available 73# a special map that is always available
75our $LINK_MAP; 74our $LINK_MAP;
76 75our $EMERGENCY_POSITION;
77our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
78 76
79############################################################################# 77#############################################################################
80 78
81=head2 GLOBAL VARIABLES 79=head2 GLOBAL VARIABLES
82 80
… …
181sub to_json($) { 179sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 180 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 181 JSON::Syck::Dump $_[0]
184} 182}
185 183
184=item cf::lock_wait $string
185
186Wait until the given lock is available. See cf::lock_acquire.
187
188=item my $lock = cf::lock_acquire $string
189
190Wait until the given lock is available and then acquires it and returns
191a Coro::guard object. If the guard object gets destroyed (goes out of scope,
192for example when the coroutine gets canceled), the lock is automatically
193returned.
194
195Lock names should begin with a unique identifier (for example, cf::map::find
196uses map_find and cf::map::load uses map_load).
197
198=cut
199
200our %LOCK;
201
202sub lock_wait($) {
203 my ($key) = @_;
204
205 # wait for lock, if any
206 while ($LOCK{$key}) {
207 push @{ $LOCK{$key} }, $Coro::current;
208 Coro::schedule;
209 }
210}
211
212sub lock_acquire($) {
213 my ($key) = @_;
214
215 # wait, to be sure we are not locked
216 lock_wait $key;
217
218 $LOCK{$key} = [];
219
220 Coro::guard {
221 # wake up all waiters, to be on the safe side
222 $_->ready for @{ delete $LOCK{$key} };
223 }
224}
225
226sub freeze_mainloop {
227 return unless $TICK_WATCHER->is_active;
228
229 my $guard = Coro::guard { $TICK_WATCHER->start };
230 $TICK_WATCHER->stop;
231 $guard
232}
233
234=item cf::async { BLOCK }
235
236Currently the same as Coro::async_pool, meaning you cannot use
237C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
238thing you are allowed to do is call C<prio> on it.
239
240=cut
241
242BEGIN { *async = \&Coro::async_pool }
243
186=item cf::sync_job { BLOCK } 244=item cf::sync_job { BLOCK }
187 245
188The design of crossfire+ requires that the main coro ($Coro::main) is 246The design of crossfire+ requires that the main coro ($Coro::main) is
189always able to handle events or runnable, as crossfire+ is only partly 247always able to handle events or runnable, as crossfire+ is only partly
190reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 248reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable.
… …
203 # this is the main coro, too bad, we have to block 261 # this is the main coro, too bad, we have to block
204 # till the operation succeeds, freezing the server :/ 262 # till the operation succeeds, freezing the server :/
205 263
206 # TODO: use suspend/resume instead 264 # TODO: use suspend/resume instead
207 # (but this is cancel-safe) 265 # (but this is cancel-safe)
208 local $FREEZE = 1; 266 my $freeze_guard = freeze_mainloop;
209 267
210 my $busy = 1; 268 my $busy = 1;
211 my @res; 269 my @res;
212 270
213 (Coro::async { 271 (async {
214 @res = eval { $job->() }; 272 @res = eval { $job->() };
215 warn $@ if $@; 273 warn $@ if $@;
216 undef $busy; 274 undef $busy;
217 })->prio (Coro::PRIO_MAX); 275 })->prio (Coro::PRIO_MAX);
218 276
219 while ($busy) { 277 while ($busy) {
220 Coro::cede_notself; 278 Coro::cede or Event::one_event;
221 Event::one_event unless Coro::nready;
222 } 279 }
223 280
224 wantarray ? @res : $res[0] 281 wantarray ? @res : $res[0]
225 } else { 282 } else {
226 # we are in another coroutine, how wonderful, everything just works 283 # we are in another coroutine, how wonderful, everything just works
227 284
228 $job->() 285 $job->()
229 } 286 }
230} 287}
231 288
232=item $coro = cf::coro { BLOCK } 289=item $coro = cf::async_ext { BLOCK }
233 290
234Creates and returns a new coro. This coro is automcatially being canceled 291Like async, but this coro is automcatially being canceled when the
235when the extension calling this is being unloaded. 292extension calling this is being unloaded.
236 293
237=cut 294=cut
238 295
239sub coro(&) { 296sub async_ext(&) {
240 my $cb = shift; 297 my $cb = shift;
241 298
242 my $coro; $coro = async { 299 my $coro = &Coro::async ($cb);
243 eval {
244 $cb->();
245 };
246 warn $@ if $@;
247 };
248 300
249 $coro->on_destroy (sub { 301 $coro->on_destroy (sub {
250 delete $EXT_CORO{$coro+0}; 302 delete $EXT_CORO{$coro+0};
251 }); 303 });
252 $EXT_CORO{$coro+0} = $coro; 304 $EXT_CORO{$coro+0} = $coro;
… …
1062package cf::map; 1114package cf::map;
1063 1115
1064use Fcntl; 1116use Fcntl;
1065use Coro::AIO; 1117use Coro::AIO;
1066 1118
1067our $MAX_RESET = 7200; 1119our $MAX_RESET = 3600;
1068our $DEFAULT_RESET = 3600; 1120our $DEFAULT_RESET = 3000;
1069 1121
1070sub generate_random_map { 1122sub generate_random_map {
1071 my ($path, $rmp) = @_; 1123 my ($path, $rmp) = @_;
1072 1124
1073 # mit "rum" bekleckern, nicht 1125 # mit "rum" bekleckern, nicht
… …
1089# and all this just because we cannot iterate over 1141# and all this just because we cannot iterate over
1090# all maps in C++... 1142# all maps in C++...
1091sub change_all_map_light { 1143sub change_all_map_light {
1092 my ($change) = @_; 1144 my ($change) = @_;
1093 1145
1094 $_->change_map_light ($change) for values %cf::MAP; 1146 $_->change_map_light ($change)
1147 for grep $_->outdoor, values %cf::MAP;
1095} 1148}
1096 1149
1097sub try_load_header($) { 1150sub try_load_header($) {
1098 my ($path) = @_; 1151 my ($path) = @_;
1099 1152
… …
1102 or return; 1155 or return;
1103 1156
1104 my $map = cf::map::new 1157 my $map = cf::map::new
1105 or return; 1158 or return;
1106 1159
1160 # for better error messages only, will be overwritten
1161 $map->path ($path);
1162
1107 $map->load_header ($path) 1163 $map->load_header ($path)
1108 or return; 1164 or return;
1109 1165
1110 $map->{load_path} = $path; 1166 $map->{load_path} = $path;
1111 1167
1112 $map 1168 $map
1113} 1169}
1114 1170
1171sub find;
1115sub find_map { 1172sub find {
1116 my ($path, $origin) = @_; 1173 my ($path, $origin) = @_;
1117 1174
1118 #warn "find_map<$path,$origin>\n";#d# 1175 #warn "find<$path,$origin>\n";#d#
1119 1176
1120 $path = new cf::path $path, $origin && $origin->path; 1177 $path = new cf::path $path, $origin && $origin->path;
1121 my $key = $path->as_string; 1178 my $key = $path->as_string;
1122 1179
1180 cf::lock_wait "map_find:$key";
1181
1123 $cf::MAP{$key} || do { 1182 $cf::MAP{$key} || do {
1183 my $guard = cf::lock_acquire "map_find:$key";
1184
1124 # do it the slow way 1185 # do it the slow way
1125 my $map = try_load_header $path->save_path; 1186 my $map = try_load_header $path->save_path;
1126 1187
1188 Coro::cede;
1189
1127 if ($map) { 1190 if ($map) {
1191 $map->last_access ((delete $map->{last_access})
1192 || $cf::RUNTIME); #d#
1128 # safety 1193 # safety
1129 $map->{instantiate_time} = $cf::RUNTIME 1194 $map->{instantiate_time} = $cf::RUNTIME
1130 if $map->{instantiate_time} > $cf::RUNTIME; 1195 if $map->{instantiate_time} > $cf::RUNTIME;
1131 } else { 1196 } else {
1132 if (my $rmp = $path->random_map_params) { 1197 if (my $rmp = $path->random_map_params) {
… …
1137 1202
1138 $map or return; 1203 $map or return;
1139 1204
1140 $map->{load_original} = 1; 1205 $map->{load_original} = 1;
1141 $map->{instantiate_time} = $cf::RUNTIME; 1206 $map->{instantiate_time} = $cf::RUNTIME;
1207 $map->last_access ($cf::RUNTIME);
1142 $map->instantiate; 1208 $map->instantiate;
1143 1209
1144 # per-player maps become, after loading, normal maps 1210 # per-player maps become, after loading, normal maps
1145 $map->per_player (0) if $path->{user_rel}; 1211 $map->per_player (0) if $path->{user_rel};
1146 } 1212 }
1147 #Coro::Timer::sleep 1;#d#
1148 1213
1149 $map->path ($key); 1214 $map->path ($key);
1150 $map->{path} = $path; 1215 $map->{path} = $path;
1151 $map->{last_save} = $cf::RUNTIME; 1216 $map->{last_save} = $cf::RUNTIME;
1152 $map->last_access ($cf::RUNTIME); 1217
1218 Coro::cede;
1153 1219
1154 if ($map->should_reset) { 1220 if ($map->should_reset) {
1155 $map->reset; 1221 $map->reset;
1222 undef $guard;
1156 $map = find_map $path; 1223 $map = find $path
1224 or return;
1157 } 1225 }
1158 1226
1159 $cf::MAP{$key} = $map 1227 $cf::MAP{$key} = $map
1160 } 1228 }
1161} 1229}
1162 1230
1163sub load { 1231sub load {
1164 my ($self) = @_; 1232 my ($self) = @_;
1165 1233
1234 my $path = $self->{path};
1235 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1236
1166 return if $self->in_memory != cf::MAP_SWAPPED; 1237 return if $self->in_memory != cf::MAP_SWAPPED;
1167 1238
1168 $self->in_memory (cf::MAP_LOADING); 1239 $self->in_memory (cf::MAP_LOADING);
1169
1170 my $path = $self->{path};
1171 1240
1172 $self->alloc; 1241 $self->alloc;
1173 $self->load_objects ($self->{load_path}, 1) 1242 $self->load_objects ($self->{load_path}, 1)
1174 or return; 1243 or return;
1175 1244
… …
1181 if (aio_open $uniq, O_RDONLY, 0) { 1250 if (aio_open $uniq, O_RDONLY, 0) {
1182 $self->clear_unique_items; 1251 $self->clear_unique_items;
1183 $self->load_objects ($uniq, 0); 1252 $self->load_objects ($uniq, 0);
1184 } 1253 }
1185 } 1254 }
1255
1256 Coro::cede;
1186 1257
1187 # now do the right thing for maps 1258 # now do the right thing for maps
1188 $self->link_multipart_objects; 1259 $self->link_multipart_objects;
1189 1260
1190 if ($self->{path}->is_style_map) { 1261 if ($self->{path}->is_style_map) {
… …
1198 $self->difficulty ($self->estimate_difficulty) 1269 $self->difficulty ($self->estimate_difficulty)
1199 unless $self->difficulty; 1270 unless $self->difficulty;
1200 $self->activate; 1271 $self->activate;
1201 } 1272 }
1202 1273
1274 Coro::cede;
1275
1203 $self->in_memory (cf::MAP_IN_MEMORY); 1276 $self->in_memory (cf::MAP_IN_MEMORY);
1204} 1277}
1205 1278
1206sub load_map_sync { 1279sub find_sync {
1207 my ($path, $origin) = @_; 1280 my ($path, $origin) = @_;
1208 1281
1209 #warn "load_map_sync<$path, $origin>\n";#d# 1282 cf::sync_job { cf::map::find $path, $origin }
1283}
1210 1284
1211 cf::sync_job { 1285sub do_load_sync {
1212 my $map = cf::map::find_map $path, $origin 1286 my ($map) = @_;
1213 or return; 1287
1214 $map->load; 1288 cf::sync_job { $map->load };
1215 $map
1216 }
1217} 1289}
1218 1290
1219sub save { 1291sub save {
1220 my ($self) = @_; 1292 my ($self) = @_;
1221 1293
1294 my $lock = cf::lock_acquire "map_data:" . $self->path;
1295
1222 $self->{last_save} = $cf::RUNTIME; 1296 $self->{last_save} = $cf::RUNTIME;
1223 1297
1224 return unless $self->dirty; 1298 return unless $self->dirty;
1225 1299
1226 my $save = $self->{path}->save_path; utf8::encode $save; 1300 my $save = $self->{path}->save_path; utf8::encode $save;
1227 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1301 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1228 1302
1229 $self->{load_path} = $save; 1303 $self->{load_path} = $save;
1230 1304
1231 return if $self->{deny_save}; 1305 return if $self->{deny_save};
1306
1307 local $self->{last_access} = $self->last_access;#d#
1232 1308
1233 if ($uniq) { 1309 if ($uniq) {
1234 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1310 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1235 $self->save_objects ($uniq, cf::IO_UNIQUES); 1311 $self->save_objects ($uniq, cf::IO_UNIQUES);
1236 } else { 1312 } else {
… …
1239} 1315}
1240 1316
1241sub swap_out { 1317sub swap_out {
1242 my ($self) = @_; 1318 my ($self) = @_;
1243 1319
1320 # save first because save cedes
1321 $self->save;
1322
1323 my $lock = cf::lock_acquire "map_data:" . $self->path;
1324
1244 return if $self->players; 1325 return if $self->players;
1245 return if $self->in_memory != cf::MAP_IN_MEMORY; 1326 return if $self->in_memory != cf::MAP_IN_MEMORY;
1246 return if $self->{deny_save}; 1327 return if $self->{deny_save};
1247 1328
1248 $self->save;
1249 $self->clear; 1329 $self->clear;
1250 $self->in_memory (cf::MAP_SWAPPED); 1330 $self->in_memory (cf::MAP_SWAPPED);
1251} 1331}
1252 1332
1253sub reset_at { 1333sub reset_at {
… …
1291} 1371}
1292 1372
1293sub reset { 1373sub reset {
1294 my ($self) = @_; 1374 my ($self) = @_;
1295 1375
1376 my $lock = cf::lock_acquire "map_data:" . $self->path;
1377
1296 return if $self->players; 1378 return if $self->players;
1297 return if $self->{path}{user_rel};#d# 1379 return if $self->{path}{user_rel};#d#
1298 1380
1299 warn "resetting map ", $self->path;#d# 1381 warn "resetting map ", $self->path;#d#
1300 1382
… …
1319 1401
1320sub customise_for { 1402sub customise_for {
1321 my ($map, $ob) = @_; 1403 my ($map, $ob) = @_;
1322 1404
1323 if ($map->per_player) { 1405 if ($map->per_player) {
1324 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1406 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1325 } 1407 }
1326 1408
1327 $map 1409 $map
1328} 1410}
1329 1411
1330sub emergency_save { 1412sub emergency_save {
1331 local $cf::FREEZE = 1; 1413 my $freeze_guard = cf::freeze_mainloop;
1332 1414
1333 warn "enter emergency map save\n"; 1415 warn "enter emergency map save\n";
1334 1416
1335 cf::sync_job { 1417 cf::sync_job {
1336 warn "begin emergency map save\n"; 1418 warn "begin emergency map save\n";
… …
1408=cut 1490=cut
1409 1491
1410sub cf::object::player::enter_link { 1492sub cf::object::player::enter_link {
1411 my ($self) = @_; 1493 my ($self) = @_;
1412 1494
1495 $self->deactivate_recursive;
1496
1413 return if $self->map == $LINK_MAP; 1497 return if $self->map == $LINK_MAP;
1414 1498
1415 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1499 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1416 if $self->map; 1500 if $self->map;
1417 1501
1418 $self->enter_map ($LINK_MAP, 20, 20); 1502 $self->enter_map ($LINK_MAP, 20, 20);
1419 $self->deactivate_recursive;
1420} 1503}
1421 1504
1422sub cf::object::player::leave_link { 1505sub cf::object::player::leave_link {
1423 my ($self, $map, $x, $y) = @_; 1506 my ($self, $map, $x, $y) = @_;
1424 1507
1425 my $link_pos = delete $self->{_link_pos}; 1508 my $link_pos = delete $self->{_link_pos};
1426 1509
1427 unless ($map) { 1510 unless ($map) {
1428 # restore original map position 1511 # restore original map position
1429 ($map, $x, $y) = @{ $link_pos || [] }; 1512 ($map, $x, $y) = @{ $link_pos || [] };
1430 $map = cf::map::find_map $map; 1513 $map = cf::map::find $map;
1431 1514
1432 unless ($map) { 1515 unless ($map) {
1433 ($map, $x, $y) = @$EMERGENCY_POSITION; 1516 ($map, $x, $y) = @$EMERGENCY_POSITION;
1434 $map = cf::map::find_map $map 1517 $map = cf::map::find $map
1435 or die "FATAL: cannot load emergency map\n"; 1518 or die "FATAL: cannot load emergency map\n";
1436 } 1519 }
1437 } 1520 }
1438 1521
1439 ($x, $y) = (-1, -1) 1522 ($x, $y) = (-1, -1)
… …
1447 1530
1448 $self->activate_recursive; 1531 $self->activate_recursive;
1449 $self->enter_map ($map, $x, $y); 1532 $self->enter_map ($map, $x, $y);
1450} 1533}
1451 1534
1535cf::player->attach (
1536 on_logout => sub {
1537 my ($pl) = @_;
1538
1539 # abort map switching before logout
1540 if ($pl->ob->{_link_pos}) {
1541 cf::sync_job {
1542 $pl->ob->leave_link
1543 };
1544 }
1545 },
1546 on_login => sub {
1547 my ($pl) = @_;
1548
1549 # try to abort aborted map switching on player login :)
1550 # should happen only on crashes
1551 if ($pl->ob->{_link_pos}) {
1552
1553 $pl->ob->enter_link;
1554 (async {
1555 # 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
1557 $pl->ob->reply (undef,
1558 "There was an internal problem at your last logout, "
1559 . "the server will try to bring you to your intended destination in a second.",
1560 cf::NDI_RED);
1561 Coro::Timer::sleep 1;
1562 $pl->ob->leave_link;
1563 })->prio (2);
1564 }
1565 },
1566);
1567
1452=item $player_object->goto_map ($path, $x, $y) 1568=item $player_object->goto ($path, $x, $y)
1453 1569
1454=cut 1570=cut
1455 1571
1456sub cf::object::player::goto_map { 1572sub cf::object::player::goto {
1457 my ($self, $path, $x, $y) = @_; 1573 my ($self, $path, $x, $y) = @_;
1458 1574
1459 $self->enter_link; 1575 $self->enter_link;
1460 1576
1461 (Coro::async { 1577 (async {
1462 $path = new cf::path $path; 1578 $path = new cf::path $path;
1463 1579
1464 my $map = cf::map::find_map $path->as_string; 1580 my $map = cf::map::find $path->as_string;
1465 $map = $map->customise_for ($self) if $map; 1581 $map = $map->customise_for ($self) if $map;
1466 1582
1467# warn "entering ", $map->path, " at ($x, $y)\n" 1583# warn "entering ", $map->path, " at ($x, $y)\n"
1468# if $map; 1584# if $map;
1469 1585
… …
1528 1644
1529 return unless $self->type == cf::PLAYER; 1645 return unless $self->type == cf::PLAYER;
1530 1646
1531 $self->enter_link; 1647 $self->enter_link;
1532 1648
1533 (Coro::async { 1649 (async {
1650 $self->deactivate_recursive; # just to be sure
1534 unless (eval { 1651 unless (eval {
1535
1536 prepare_random_map $exit 1652 prepare_random_map $exit
1537 if $exit->slaying eq "/!"; 1653 if $exit->slaying eq "/!";
1538 1654
1539 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1655 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1540 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1656 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1541 1657
1542 1; 1658 1;
1543 }) { 1659 }) {
1544 $self->message ("Something went wrong deep within the crossfire server. " 1660 $self->message ("Something went wrong deep within the crossfire server. "
1545 . "I'll try to bring you back to the map you were before. " 1661 . "I'll try to bring you back to the map you were before. "
… …
1602 on_reply => sub { 1718 on_reply => sub {
1603 my ($ns, $msg) = @_; 1719 my ($ns, $msg) = @_;
1604 1720
1605 # this weird shuffling is so that direct followup queries 1721 # this weird shuffling is so that direct followup queries
1606 # get handled first 1722 # get handled first
1607 my $queue = delete $ns->{query_queue}; 1723 my $queue = delete $ns->{query_queue}
1724 or return; # be conservative, not sure how that can happen, but we saw a crash here
1608 1725
1609 (shift @$queue)->[1]->($msg); 1726 (shift @$queue)->[1]->($msg);
1610 1727
1611 push @{ $ns->{query_queue} }, @$queue; 1728 push @{ $ns->{query_queue} }, @$queue;
1612 1729
… …
1618 } 1735 }
1619 } 1736 }
1620 }, 1737 },
1621); 1738);
1622 1739
1623=item $client->coro (\&cb) 1740=item $client->async (\&cb)
1624 1741
1625Create a new coroutine, running the specified callback. The coroutine will 1742Create a new coroutine, running the specified callback. The coroutine will
1626be automatically cancelled when the client gets destroyed (e.g. on logout, 1743be automatically cancelled when the client gets destroyed (e.g. on logout,
1627or loss of connection). 1744or loss of connection).
1628 1745
1629=cut 1746=cut
1630 1747
1631sub cf::client::coro { 1748sub cf::client::async {
1632 my ($self, $cb) = @_; 1749 my ($self, $cb) = @_;
1633 1750
1634 my $coro; $coro = async { 1751 my $coro = &Coro::async ($cb);
1635 eval {
1636 $cb->();
1637 };
1638 warn $@ if $@;
1639 };
1640 1752
1641 $coro->on_destroy (sub { 1753 $coro->on_destroy (sub {
1642 delete $self->{_coro}{$coro+0}; 1754 delete $self->{_coro}{$coro+0};
1643 }); 1755 });
1644 1756
… …
1816 1928
1817{ 1929{
1818 my $path = cf::localdir . "/database.pst"; 1930 my $path = cf::localdir . "/database.pst";
1819 1931
1820 sub db_load() { 1932 sub db_load() {
1821 warn "loading database $path\n";#d# remove later
1822 $DB = stat $path ? Storable::retrieve $path : { }; 1933 $DB = stat $path ? Storable::retrieve $path : { };
1823 } 1934 }
1824 1935
1825 my $pid; 1936 my $pid;
1826 1937
1827 sub db_save() { 1938 sub db_save() {
1828 warn "saving database $path\n";#d# remove later
1829 waitpid $pid, 0 if $pid; 1939 waitpid $pid, 0 if $pid;
1830 if (0 == ($pid = fork)) { 1940 if (0 == ($pid = fork)) {
1831 $DB->{_meta}{version} = 1; 1941 $DB->{_meta}{version} = 1;
1832 Storable::nstore $DB, "$path~"; 1942 Storable::nstore $DB, "$path~";
1833 rename "$path~", $path; 1943 rename "$path~", $path;
… …
1881 open my $fh, "<:utf8", cf::confdir . "/config" 1991 open my $fh, "<:utf8", cf::confdir . "/config"
1882 or return; 1992 or return;
1883 1993
1884 local $/; 1994 local $/;
1885 *CFG = YAML::Syck::Load <$fh>; 1995 *CFG = YAML::Syck::Load <$fh>;
1996
1997 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
1998
1999 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2000 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2001
2002 if (exists $CFG{mlockall}) {
2003 eval {
2004 $CFG{mlockall} ? &mlockall : &munlockall
2005 and die "WARNING: m(un)lockall failed: $!\n";
2006 };
2007 warn $@ if $@;
2008 }
1886} 2009}
1887 2010
1888sub main { 2011sub main {
1889 # we must not ever block the main coroutine 2012 # we must not ever block the main coroutine
1890 local $Coro::idle = sub { 2013 local $Coro::idle = sub {
1891 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2014 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1892 (Coro::unblock_sub {
1893 Event::one_event; 2015 async { Event::one_event };
1894 })->();
1895 }; 2016 };
1896 2017
1897 cfg_load; 2018 cfg_load;
1898 db_load; 2019 db_load;
1899 load_extensions; 2020 load_extensions;
… …
1910 return; 2031 return;
1911 } 2032 }
1912 2033
1913 warn "reloading..."; 2034 warn "reloading...";
1914 2035
1915 local $FREEZE = 1; 2036 my $guard = freeze_mainloop;
1916 cf::emergency_save; 2037 cf::emergency_save;
1917 2038
1918 eval { 2039 eval {
1919 # if anything goes wrong in here, we should simply crash as we already saved 2040 # if anything goes wrong in here, we should simply crash as we already saved
1920 2041
… …
2007 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2128 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2008 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2129 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2009 2130
2010 # dirty hack because... archetypes are not yet loaded 2131 # dirty hack because... archetypes are not yet loaded
2011 Event->timer ( 2132 Event->timer (
2012 after => 2, 2133 after => 10,
2013 cb => sub { 2134 cb => sub {
2014 $_[0]->w->cancel; 2135 $_[0]->w->cancel;
2015 2136
2016 # provide some exits "home" 2137 # provide some exits "home"
2017 my $exit = cf::object::new "exit"; 2138 my $exit = cf::object::new "exit";
… …
2056 reentrant => 0, 2177 reentrant => 0,
2057 prio => 0, 2178 prio => 0,
2058 at => $NEXT_TICK || $TICK, 2179 at => $NEXT_TICK || $TICK,
2059 data => WF_AUTOCANCEL, 2180 data => WF_AUTOCANCEL,
2060 cb => sub { 2181 cb => sub {
2061 unless ($FREEZE) {
2062 cf::server_tick; # one server iteration 2182 cf::server_tick; # one server iteration
2063 $RUNTIME += $TICK; 2183 $RUNTIME += $TICK;
2064 }
2065
2066 $NEXT_TICK += $TICK; 2184 $NEXT_TICK += $TICK;
2067 2185
2068 # if we are delayed by four ticks or more, skip them all 2186 # if we are delayed by four ticks or more, skip them all
2069 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2187 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2070 2188
… …
2093 or warn "ERROR: unable to write runtime file: $!"; 2211 or warn "ERROR: unable to write runtime file: $!";
2094 })->(); 2212 })->();
2095 }, 2213 },
2096); 2214);
2097 2215
2216END { cf::emergency_save }
2217
20981 22181
2099 2219

Diff Legend

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